tree 25b7dd0bc8db0ed82d8c63636d0d2d78d5765af7
parent 2693152ec0f8cf808a0669828d361fb4033008a5
parent e1e67b6552f2ba2696f2418393f052bda9739d63
author The Android Open Source Project <initial-contribution@android.com> 1343772170 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1343772170 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Id3d564f85a9a157a34937324d65e322c584f7cdc