| commit | 3d252cee2ea745d2568c263f98717cd5e6c35b52 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:21:33 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 10 15:21:33 2012 -0800 |
| tree | 44aa0940fa5414059c7ba5bb4f09bedce203ecf8 | |
| parent | d019ecc24609fd70f7140b44f8d12e9dac601b61 [diff] | |
| parent | 626eb453cab7d19ebf9b8e536e0c0da6cc64e4cf [diff] |
am 626eb453: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '626eb453cab7d19ebf9b8e536e0c0da6cc64e4cf': JDP71 JDP68