tree 3a4d2af643f5db44d82dba7aa1837245871f68dd
parent 34b168f642a5dd30186ce76cdc9ef71d272c22cb
parent 35f8b6a16c4c9e5c77741b71c042f053b5dafa61
author The Android Open Source Project <initial-contribution@android.com> 1355522595 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1355522595 -0800

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

Change-Id: I189f31812ca5c5a5a6fc95ed35bf38664c6afb6a