tree 7aaca70b2711e9913c6fa32e8619dbb220154159
parent 06bd91ecb6ba59c5c19b2ad1325b30bd9344832d
parent 67dff6f8918eb08105990c145ef7d948ed670a9b
author The Android Open Source Project <initial-contribution@android.com> 1371085469 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1371085469 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I7f22b8b492120139d4a56684d5b5e9ef5094019e