| commit | 1c1593079433e696348195c9e3e7dc1176acc0bb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 23 08:10:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 23 08:10:23 2013 -0700 |
| tree | 4cfe5005fae8708b93ac9f8b64e92f2ee81f9d51 | |
| parent | 17775724b89e942b06c67144317697924039ad99 [diff] | |
| parent | 54d19aa66c6d446c97172599a9317caa6c456741 [diff] |
am 54d19aa6: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '54d19aa66c6d446c97172599a9317caa6c456741':