tree 24cd55ac7cf585c2dae68a2a11148205643029f7
parent e3a8cd4db13494400a88da88f2e0190f5d286011
parent c0609a2743b09908a969e14e2351bcc786ea6365
author The Android Open Source Project <initial-contribution@android.com> 1349792963 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349792963 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I94b8cbf30ab7707320dc2de4ef8a8102ed5f6091