commit | be8892a33a8ff4416e7d5e575680d268b71ecde9 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Apr 02 11:04:16 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 02 11:04:16 2013 -0700 |
tree | ad17906d25d1ec44e8724a1c7f035ebb08e74505 | |
parent | 05d6a649a3e3106c762c4da8df1fb5ef0e3f9435 [diff] | |
parent | 9de1633b6bc8ed8bc324b0741209bdb73944048c [diff] |
am 9de1633b: Reconcile with jb-mr2-release - do not merge * commit '9de1633b6bc8ed8bc324b0741209bdb73944048c':