| commit | 73fba4f6d3accbdb795c93a8511b49a3a84336c1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 16:00:07 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 03 16:00:07 2012 -0800 |
| tree | e95441b8a39fb756ca4e49e9a7e17188c01fdcf9 | |
| parent | fb28a3a4e51542e7f52b98cb5f69522181b8b8ed [diff] | |
| parent | b1ba5ec9cf1477010fa4bd151aad80eedd8a8c0c [diff] |
am b1ba5ec9: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'b1ba5ec9cf1477010fa4bd151aad80eedd8a8c0c': JDP64B