tree 7497efd94794c5c1cb47857dcf7a33b26f5fa34d
parent b6bddc2aa5bb2cf093140e3b1dec6e387ecbc770
parent c23cd41c2c540419490f425f0c481ed9d7845011
author The Android Open Source Project <initial-contribution@android.com> 1360100277 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1360100277 -0800

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

Change-Id: Ib4c90d47d0d64db2c116a47f026fb8a4c78461f9