tree 285d8e0db6df2a8068dc28578e8abd8a0ad52765
parent 52112f9fb5f241aa27e330047fb9d534ca4d466f
parent aa24df5e4265daf2085990cb23bda1a2276548cf
author The Android Open Source Project <initial-contribution@android.com> 1351866488 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1351866488 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I865e554d84e2c86debcfe02cbc31bf4b138b4264