tree 55daf036fcdc8d29981894ab19955afe44249742
parent f66a269fa4300fa691348bdd55a2a16ff55de608
parent 0f3842a028b2556118d57977316c479e5cf12df4
parent 57b607b4e965a96fd65c489073a633c9078fb091
parent ee676f508ae0463b9b13faeaadc9475908406f0b
author The Android Open Source Project <initial-contribution@android.com> 1376413796 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1376413796 -0700

Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge

Change-Id: I80fa0805a168773ba273726fb4827b6cc24bfb08