tree e06e5e113fec9dcccf0dfd4dccd1abe23f369713
parent cc8fedd302110af6bd1cc3aa8268639ca64a9c46
parent ebed8a53cca62d19d13ec2381c7e0f4acf1ba302
author The Android Open Source Project <initial-contribution@android.com> 1352233621 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233621 -0800

am ebed8a53: am 62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'ebed8a53cca62d19d13ec2381c7e0f4acf1ba302':