tree 1ffcb3922d2cdfd6dd751ef2bb376d5739bf873e
parent 77caa0d0a7c0ca3e1729ee1d2ef597b60d73a1d9
parent 2ced32fbd1fb954648d0c91b18fff0e0b22e03b7
author The Android Open Source Project <initial-contribution@android.com> 1371841017 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1371841017 -0700

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

Change-Id: Id59401f35b9a467ddcc56c2167d6c30bb6c3d3e9