tree 46a082fb0ccd3e2f74c2f0ce3588e13803406fdb
parent e499aed0dfcd0db45af767fe12072853e153a3cd
parent 214d003a47e7fe2962df667c5d65bce92a21a40e
author The Android Open Source Project <initial-contribution@android.com> 1352130963 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352130963 -0800

Reconcile with jb-mr1-release - do not merge

Change-Id: Ia20655ab55dfad2480f8b9da1f04f2068deee01c