| commit | b8d6078197c917053840d512a2a2ff4be3d9314a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 06 10:47:52 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 06 10:47:52 2012 -0800 |
| tree | 44aa0940fa5414059c7ba5bb4f09bedce203ecf8 | |
| parent | c88dea4ebe23c70d60eb3a0a5d07ec7fd96d6723 [diff] | |
| parent | 37dc9a20f045436ef9ff8a15f70eda746f411ab4 [diff] |
am 37dc9a20: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '37dc9a20f045436ef9ff8a15f70eda746f411ab4': JDP67