tree 0a0c1d154383016813d2aaf0fbf79408e42f3174
parent 370b5b2d08ba54e0ac91c6706d9b7820468d0317
parent 4f4abab001a4d6101379284119f0a1a4947a03bf
author The Android Open Source Project <initial-contribution@android.com> 1354030984 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354030984 -0800

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

Change-Id: Iad0c1acc5bc938d9fb65b64119152daee5a71a1c