tree 21fccb2f0b22b130e7b6d1ba27b5275e3bac2981
parent d25b6b7372984cc0986868af9c53a4979436b6a8
parent ccf8df7decbe7c864af2600255a4d2be257a9859
author The Android Open Source Project <initial-contribution@android.com> 1373322823 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1373322823 -0700

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

Change-Id: Id0d9eb3205906b409e735546b988f43a3bdcc0ae