tree 3d7b9f6ac5ad0ef0605fc64c439e37c53e395982
parent 43044c21172e76e441ac10909af2ceb705a9d1af
parent b10756cf6c650ead77de6cbeb8236fa61b4d9bb7
author The Android Open Source Project <initial-contribution@android.com> 1363097800 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363097800 +0000

am b10756cf: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'b10756cf6c650ead77de6cbeb8236fa61b4d9bb7':