| commit | d019ecc24609fd70f7140b44f8d12e9dac601b61 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 07 07:54:47 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 07 07:54:47 2012 -0800 |
| tree | 44aa0940fa5414059c7ba5bb4f09bedce203ecf8 | |
| parent | b8d6078197c917053840d512a2a2ff4be3d9314a [diff] | |
| parent | 312038af92df10fb8787852fa73b66d5c2e31f7f [diff] |
am 312038af: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '312038af92df10fb8787852fa73b66d5c2e31f7f': JDP67B