tree 5862b78d667371e87353d024d877a07edf11fa94
parent 5d7d6ace05e310115d13fe31d68a218c7f20c18c
parent 279731e733c27fd8dfb24d740c05f9ba1b4f8db0
author The Android Open Source Project <initial-contribution@android.com> 1351781513 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1351781513 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Id8e9b62ec7d117c1b6bdbeb739be7148f15f31cb