tree 2be7b85e24e8de6d7443cb0d72c72aa33dd8ab83
parent eeb90735dd7accfa34d77bcc8023412dab84bf9d
parent d9575910e72dda3cacfb171a447c9bfea81d3c0c
author The Android Open Source Project <initial-contribution@android.com> 1373906016 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1373906016 -0700

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

Change-Id: Id0cd5164aa3d404463c520c3361cce521f3577fe