| commit | 9207e5aed86f5442e97614980a2c6c6bf123f97d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 03 18:05:26 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 03 18:05:26 2013 -0700 |
| tree | ccd3e537aea32517c2b1c416bcfe52be263e9f18 | |
| parent | fbfedc7a7ced75e5f0526729ddecd87ad7ce9b20 [diff] | |
| parent | cd6f4804d22a119c1aaf915d70a53924b1666777 [diff] |
am cd6f4804: Reconcile with jb-mr2-release - do not merge * commit 'cd6f4804d22a119c1aaf915d70a53924b1666777':