tree 51bac729f7186c76f114019f891c6388dc2022b7
parent e70625a1061d331b39e7de9091e4b5e74e071b29
parent 4a2176807b5686a815ff0bf12990b8fcbc27d8cc
author The Android Open Source Project <initial-contribution@android.com> 1351700334 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1351700334 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Id228f3f2787e977efe8f0a67a3c350f682b4f9f8