tree 08237c5cdc51537ab4b99c92395e78ad97142a78
parent 50f8d2856b6644059b31684687842bf9c1f2e814
parent 4f9fb2ba977c6ed119211fd43ff1ece9ba163fc3
author The Android Open Source Project <initial-contribution@android.com> 1355181583 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1355181583 -0800

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

Change-Id: I97991f966ea0d3a6f3bad87c82d9926d55e6d63c