| commit | c88dea4ebe23c70d60eb3a0a5d07ec7fd96d6723 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 05 13:00:48 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 05 13:00:48 2012 -0800 |
| tree | 44aa0940fa5414059c7ba5bb4f09bedce203ecf8 | |
| parent | 19cc22bc9c442c16271f618e41297e8c660ed6d2 [diff] | |
| parent | 7d091828d937fd7895a20026a81fec9981ad0717 [diff] |
am 7d091828: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '7d091828d937fd7895a20026a81fec9981ad0717': JDP66 JDP65