tree 9708c4cabf0995ae461307fc5e65c5b8fb2426c6
parent 8fde167ba27de7f4e302c8fb23380ddca7655989
parent c5a4eb547e7e9c443f4a47a450fce95939241dd0
author The Android Open Source Project <initial-contribution@android.com> 1345590457 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1345590457 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ie51b5f85342674d507d7db2e7fb681f0f4088693