tree 18edaa92da53733b027bb753a10cdaa472e98e07
parent 31b161cedce884cb7a1426f810d4e1cba9d33f46
parent d6da9bb65e752e59835c8ce5412f9848bafc77d9
parent fba3d4e98fac09a394c20cb66fb7d0232e8c5ead
author The Android Open Source Project <initial-contribution@android.com> 1371046990 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1371046990 -0700

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

Change-Id: I9f012993eb7dccac74fec611f0ea1c8dcd71d93f