tree 9233061d186a6d92e9fb42f63fdffd98c68bc219
parent 1cd68527a6c4cc92608dfe8a8c6ba51e5e2c4fc2
parent fb5cee14445622010af46da1fe9a013fe3868d48
author The Android Open Source Project <initial-contribution@android.com> 1369924291 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1369924291 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Ia17841b4d49f0fe09e1034ff0b28efe55947f03a