tree c8fcd91d7fb71c882e8d65b0b3acdd99a8bd1418
parent ba34449e19447e60a536937554cd1fa1a3db796d
parent 33f6c7c1eaf8f66d6f7e4b5ac925ab3e4b17df08
parent 4674a5e5576c0399702c7183b21b1707df01ecac
author The Android Open Source Project <initial-contribution@android.com> 1370540224 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1370540224 -0700

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

Change-Id: I703e29979e026bdbac00dbce8dd6958eac0c40aa