commit | 6c48aca3451f642e173f4fc8de6bc0f3d9e731dc | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Apr 11 07:47:08 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 11 07:47:08 2013 -0700 |
tree | 9e1fa9ee533dfacb7a81c4200df022f14d48c0ec | |
parent | 980d21745c6a31e200d6dde2a60d7c353422f7b3 [diff] | |
parent | ab911a02af2a5c3977b55cb0994f74635edc7c3a [diff] |
am ab911a02: Reconcile with jb-mr2-release - do not merge * commit 'ab911a02af2a5c3977b55cb0994f74635edc7c3a':