commit | 81099a92b9946b03ee64a3fd8fd2ca4d15acbc66 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 15 10:53:13 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 15 10:53:13 2013 -0700 |
tree | b5524ab1c4cd62872d3402ae843365aee33b3ebb | |
parent | ea4b3867c4db9e5dc64f39bab8a6eb2ee18a560b [diff] | |
parent | 160a22b8fbc2c25cb893e92fcad2db8fc26e24b2 [diff] |
am 160a22b8: Reconcile with jb-mr2-release - do not merge * commit '160a22b8fbc2c25cb893e92fcad2db8fc26e24b2':