commit | 82c2f29d1442cae735b852d502c626c7a563d94b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon May 20 08:22:44 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 20 08:22:44 2013 -0700 |
tree | 1586e4d3a04a36390be4c01e52fbeeca061602bb | |
parent | 3705f3a3f7adfae03e5086db242c689e6f63fc95 [diff] | |
parent | cb66f08ba5dfcaf1554c8289d7f1e92e3f2f2a45 [diff] |
am cb66f08b: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'cb66f08ba5dfcaf1554c8289d7f1e92e3f2f2a45': "JWR50" "JWR49" JWR46C