tree d80b14c181fd197af7e12434b524b04961ba10f3
parent c012edbc519b74456530c26719133f96d4574de3
parent 3b1ec028751da12b81532f21f5aeea6df7853943
author The Android Open Source Project <initial-contribution@android.com> 1371840998 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1371840998 -0700

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

Change-Id: I38129dc3a8a50f254dbe8155736f45f247deb1af