| commit | 0b2aa7f63bf140497b0d31f11c4b60f37e15de9e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:32:15 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:32:15 2012 -0800 |
| tree | 77159f69ff72b4c504088d607bea7e5038b44b67 | |
| parent | 43f579e9f69fa8a55c6e65d3d78206094f0c9fe5 [diff] | |
| parent | 9185a6c2c315a8db537edc5d1bf582199d157bb2 [diff] |
am 9185a6c2: (-s ours) am a8ec322b: am bc43e3f2: Reconcile with jb-mr1-release - do not merge * commit '9185a6c2c315a8db537edc5d1bf582199d157bb2':