| commit | 3622c73cfc7d0839277b6ff186eeca313a1b2470 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:59:18 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 05:59:18 2012 -0700 |
| tree | 2c61c9c436b8a0d6f8291df791ce383ba548b4cf | |
| parent | 9ab8851756e7bce482626dde29e47098978354e9 [diff] | |
| parent | d1844d4b30a0f75ed0c30c923bea7c718ba53034 [diff] |
am d1844d4b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd1844d4b30a0f75ed0c30c923bea7c718ba53034':