tree 53cfab5dd8ce23d9bb07c28c674360466c217908
parent 6e204c6d0dbf68113cef737f4d472c6f71e175c2
parent 6342befcdc1eaa66959389cd46bf9881063999b1
parent 25e81f36838c64ac45a83f677095eb1dd2755db4
author The Android Open Source Project <initial-contribution@android.com> 1352233144 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352233144 -0800

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Iaa4e6374ff4c693fbcacf52dfa2053246f514ff5