tree 51bac729f7186c76f114019f891c6388dc2022b7
parent 08ea3b10b482d4d08e59e03291d2feb3b361500d
parent 60b34f48423083e8f5988b3cbbaa1ab3f403dfb5
author The Android Open Source Project <initial-contribution@android.com> 1352234286 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352234286 -0800

Reconcile with jb-mr1.1-release - do not merge

Change-Id: I85d65e59a36ccffb027cd67848a2aebdf3cfdfe0