| commit | 0d54bc21d49ed11304e891fb079bcaf61b6bd4c6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:44:35 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 15:44:35 2012 -0800 |
| tree | ecda00d7701fc24e070044d0cc46858eb91a884e | |
| parent | bcf7d100f7bf900b147caa63225b6d92a8b3accb [diff] | |
| parent | 752044261f170477bfcc5d0684526c4061299fa3 [diff] |
am 75204426: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '752044261f170477bfcc5d0684526c4061299fa3':