tree d26dc6dc861c69c8f80ae9aac9a13b14bee3381b
parent 52eeea4fa59c15ecb09c32b8e05653f4e55f5188
parent f8be7694889cbdb08ef7edd605d11607bb3638a0
author The Android Open Source Project <initial-contribution@android.com> 1346943160 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1346943160 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ia9cde557f8e6abaf0935e6b238eb956be09c12ca