tree a4806fca16d22780237a4c61b14638afdd508586
parent eddbe4e9946b1175f4549617abc4b792e778ac4a
parent f72d698ff146103c05c76346909a3abe6a70d1c6
author The Android Open Source Project <initial-contribution@android.com> 1349960274 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349960274 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Idf9e1ad5fe56ee4d56e5266630b6f971ecba10c7