tree 152b501788a5279f3baf903dacdd35be984816d0
parent cecd9e46ab814dc7bc72efa9adda6ddc88707c02
parent 29ae16e058274d99dc02f91d84af6ca5222b3c52
author The Android Open Source Project <initial-contribution@android.com> 1352233878 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233878 -0800

am 29ae16e0: (-s ours) am a795ab85: am c39ee474: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '29ae16e058274d99dc02f91d84af6ca5222b3c52':