commit | 43d85b97aae534f686b88b351491bb292b8ad369 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Apr 11 07:50:54 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 11 07:50:54 2013 -0700 |
tree | e4ab5c54c009ca953c46cb71c78fac9c24883ee9 | |
parent | 59bfe9adf085bcc4c0d88b026d94bbc7e97395e1 [diff] | |
parent | 06fca9977dffadc5621c1c940634b19e95b7b319 [diff] |
am 06fca997: Reconcile with jb-mr2-release - do not merge * commit '06fca9977dffadc5621c1c940634b19e95b7b319':