| commit | 7a396c3972de860a4a5874cd3ff1b6b88a610cc2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 09 07:22:10 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 09 07:22:10 2012 -0800 |
| tree | f5c922b232fd38ffb540b555f011baa08780405e | |
| parent | ecba011fd81386895fda02a7d132eadf5c710ae0 [diff] | |
| parent | 18f95189727de29246b663ad4557075678217555 [diff] |
am 18f95189: Reconcile with jb-mr1-release - do not merge * commit '18f95189727de29246b663ad4557075678217555':