tree 88ded1977b73276f93db557f58128bbb989171ca
parent 9f413b77b05998b2dfe831d8752ba952f524b9ba
parent 2bbf02c9b07369a6a9802486c50830885d873381
author The Android Open Source Project <initial-contribution@android.com> 1348675745 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348675745 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I1071ef79a7f5080b822cc4032647ea1feacd5d12