tree 5862b78d667371e87353d024d877a07edf11fa94
parent 86c93df1d626c42147db2f2a6dfb5dcad83477ec
parent 6de35d839f3d5098c6b81ccc919b1f8737644b45
parent 279731e733c27fd8dfb24d740c05f9ba1b4f8db0
author The Android Open Source Project <initial-contribution@android.com> 1352233011 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352233011 -0800

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ibb893211cd723e60db60b80a3da19c58575461e2