tree d860d6b7f55c3522f68eeeef8e602a5f34fa57e8
parent ad1f493c832bd382101c7291e6e5751e16f174ff
parent 1de228cffeb12caeda2c4efa5fb543ccb2c39ecb
author The Android Open Source Project <initial-contribution@android.com> 1345590453 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1345590453 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I8497c7775dbf3b4764ffb6aff7c4aa209739dd3f