tree f1e1174d74f608217caffc6b9798bfa4d9fe98e5
parent 958e66fe1803a6bf5880ad11c43825aa5a55a260
parent 277a46a5df77d5595a91d3a312a1a6d0195e6043
author The Android Open Source Project <initial-contribution@android.com> 1369063211 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1369063211 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I3e888cfc8bdddb707a2b06256dc7ed794e568ec4