| commit | 5ba418b3a8fdf2b27b31f4dd8d110b004733ce4a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 05 13:00:52 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 05 13:00:52 2012 -0800 |
| tree | 3356e4c635f6913d10fbc857cefcbd63d8702ffd | |
| parent | 0fbfb56d1b1ec1b9b8ccafe077f87a2e29fcb4e0 [diff] | |
| parent | 0b3edb28b7d5ec84de600838cdae1483f967317b [diff] |
am 0b3edb28: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '0b3edb28b7d5ec84de600838cdae1483f967317b':