tree 26b6251d2830aa28d9e31410f4c856623555b7d6
parent c74962df0d30bdb176472a1775a794fd93b1cd7a
parent fb4152c14bbcd1da0f65c995bf1666edec0afa6d
parent 283486517d4e3382aa387185e1b4ce52df5eb0be
author The Android Open Source Project <initial-contribution@android.com> 1354030428 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354030428 -0800

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

Change-Id: Ifb0a30557854004e5a4c90944908a91d70ceb8c6