| commit | be132adff11f8d9508378beaa054dd44b30b1881 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:40:25 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:40:25 2012 -0700 |
| tree | b7ecb90b14abd16341d34d0118f19da95ab15400 | |
| parent | 8319dc46b2c2efbc2d63baeb20a647ba99d79075 [diff] | |
| parent | d5d5927584ce77872dfd070bb3c6558cf6fd441d [diff] |
am d5d59275: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd5d5927584ce77872dfd070bb3c6558cf6fd441d':