| commit | e3c4001cdbe11b93d35226e06adb5bb46626eb27 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 15:58:56 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:58:56 2012 -0800 |
| tree | c34c737e9a58aef1523d595e107ac8662f9340a2 | |
| parent | 55fdd58af8784a408d23af7882ed2d9e13324ace [diff] | |
| parent | 167296d70a022fc65a4e9fda10f3bd13e1d4b428 [diff] |
am 167296d7: (-s ours) am 5c0da20c: am 71a408b9: Reconcile with jb-mr1-release - do not merge * commit '167296d70a022fc65a4e9fda10f3bd13e1d4b428':