| commit | c2cf819fe98f1efeea45d0069f5e9001f8f76be2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:23:32 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:23:32 2012 -0700 |
| tree | cfb403c6ffc7cc28ded75f643f1b04163f01d9e8 | |
| parent | 0ea2c80d8d508dfb6480cd0e53eb32a8c7745788 [diff] | |
| parent | b2b10f9ad814574a3559ff2d32cbe2d173d14aab [diff] |
am b2b10f9a: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'b2b10f9ad814574a3559ff2d32cbe2d173d14aab':