tree d107c25c3bc97a6cb1f25fb00aeb10a2882d5f26
parent 7047e4aff7402cbc1738f041f9777550e1bd087c
parent ba668e07d2ab01a95a9ef941e17483199d53ffe8
author The Android Open Source Project <initial-contribution@android.com> 1344438999 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1344439000 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I3bafd77a8fe73cc617dda88332b1a403f4803402