tree 730ce077882f36b06db5874325d709f529852b3b
parent 5951d1ea0d7a85da510eb06f8b73e62113ef800a
parent 2460df91159f2d581cc2567bb9a9424d52464a5b
author The Android Open Source Project <initial-contribution@android.com> 1373998751 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1373998751 -0700

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

Change-Id: I8a36562b71e8ca51a52e9e893f3fb302ea414f24