tree 7216f1b921c36dc9fd95a821d1f6a8e630644209
parent 9ad2c67ab0da915134dc6020f57cce8f7cb30c70
parent d3899082d4ad31a1e2f9fe45989ebd6e852d4ea6
author The Android Open Source Project <initial-contribution@android.com> 1368820488 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1368820488 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I777d9066b0b198cfcb65bd17b8206d9d046b8d51