tree f4d92dfd643f05f5cd49e15eb530783eeeb13d5f
parent 2dd69cfca3e2a2b7c398198366d03ba1801e1bd9
parent eadd1cf1608de3ef3c45fd16aa055a023eb2196f
author The Android Open Source Project <initial-contribution@android.com> 1366047965 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1366047965 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I73bc6567706973507090e4c9bc05cd61ee850260