| commit | c8c5ad6a323476b85adba337574b72d38649c8aa | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:57:06 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:57:06 2012 -0700 |
| tree | 5ce68ec65af9f9bc1a92c150cb28d40a698b13dd | |
| parent | 8d1ee30b8c867ac3a5f6daef0bdf97d4ea777cfe [diff] | |
| parent | 1da71728a8d126d8e0697bb7c2efac60360eb4c9 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ie5b35b4154bf8cc096620a99382b5137ebb5ca81