tree c735ab79fd763ace34815c0edd4f5771e70d11fb
parent babe71d5e5392eea8121a5d498fde33b69e08d96
parent c65102d8832744e7b061d6d96e9c02ba91509dde
author The Android Open Source Project <initial-contribution@android.com> 1371393831 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1371393831 -0700

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

Change-Id: Ie1b6c70bf9080fbea066bfa80ba6d1908cff638e