tree f5569834e91d51fd75ee0d6546f6505c979644ea
parent 89f22e7b4791039e4df130a7a5951b8a70728d8c
parent e165f7b27e1ecd9582c3e161a1eb932c25057c96
author The Android Open Source Project <initial-contribution@android.com> 1372689797 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1372689797 -0700

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

Change-Id: Ia430ad311d9a3c38499ccfd480283e992dc7214d