tree ce0b3526ee71ef9083837105dbbc5262a4c81b87
parent 6de7bde49b76542cadb9ad7d3b618df305cef9bc
parent 2facb7b969ebf1e3dc235991634dbc062eaf329f
parent c4351cf30e03edac295409d17fa67d64b86c08bb
author The Android Open Source Project <initial-contribution@android.com> 1349887444 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349887444 -0700

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

Change-Id: I46fd654e5e5a4088c616ed35b901eb1e8ed4d963