tree 30f8d67905ea54467b9b21d41abe1e3e3bc8e791
parent 857b2ef099083cb2c35ed2b03030d0b8c6c80abf
parent fcc1116423cf4fe12faca9ac7fd2f0d2fe1d18ec
author The Android Open Source Project <initial-contribution@android.com> 1343771326 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1343771326 -0700

Reconcile with jb-mr0-release - do not merge

Change-Id: I96a076254209becd703d8a61d027bd41527f58fa