tree d5cd51a2f62db49a644f3c62f2d58861593435dd
parent cbf2b86d223d5b7a9b6a05db2b6d446251586870
parent a00dfa71b74ccf6dd3b44c90d7cac88e07475acb
author The Android Open Source Project <initial-contribution@android.com> 1349792950 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349792950 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I2d81c143dd737e9faf93df9a104d79f7f36fd429