tree 3839c4df6e46ad8490e6c0ed5cb7f0b46c67498d
parent 299cf6da2ecf2177f01985e283cdd78a1c05d4d0
parent c07014e251a320876accf57270d92081c979df63
author The Android Open Source Project <initial-contribution@android.com> 1365691525 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1365691525 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I49fd5e4403bfbd598174527115887dd252dcf17a