| commit | 77ea82f6974c54d432c657a56b4db2257a0b520e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 08 08:21:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 08 08:21:52 2012 -0700 |
| tree | f85d768a2546521cee32365ae084d9cf90cdac7c | |
| parent | 4b6c57c74bd6120bcba72803d1af04cc7e69131b [diff] | |
| parent | a01ab9e5763b16e89239f40a56edfee5f0c8fa75 [diff] |
am a01ab9e5: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a01ab9e5763b16e89239f40a56edfee5f0c8fa75':