commit | b6bfe68df84fdafdf8a768349c15b96ebde3dbff | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Apr 11 07:47:12 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 11 07:47:12 2013 -0700 |
tree | 2567cc8847adf61755e506abeadeab453a5ca2ee | |
parent | f5a9d4f119cb110f1365a0ba99c33e1240a7daf5 [diff] | |
parent | c1213473de0890856341bed09ef08b14603ddb30 [diff] |
am c1213473: Reconcile with jb-mr2-release - do not merge * commit 'c1213473de0890856341bed09ef08b14603ddb30': "JWR11" JWR10C