tree ef3eadabdd66dd30392c9a451410c5ad3950294c
parent f1761254147f61f503d0de1627d9c06b40ef861f
parent 21da7124dad3e0f78f39d2bbd7b38381c8a1a253
author The Android Open Source Project <initial-contribution@android.com> 1349967921 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349967921 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ibad2e367e7b86df59e5be5c5db6f2165f07fadb9