commit | 5759deadaad0b1055a703b11ed6509b8e46a0140 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 14:49:06 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 14:49:06 2012 -0700 |
tree | 50277a407a947a09980d6fb497dc5b27b88597e2 | |
parent | 76a6dc3a191e8800211eb49398d37deae731094e [diff] | |
parent | a6c77d92fcbc2a39758ab28c32b701025d637a7b [diff] |
am a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge * commit 'a6c77d92fcbc2a39758ab28c32b701025d637a7b': JZO54K JRO03X