tree 80c121d9ee8313c471f9b458727265e91b9dd7bf
parent 85b730dd995fe4d633d86c3e186df792043657fb
parent 1b56dc7757b69a3a0e02e319350a11287cc224fb
author The Android Open Source Project <initial-contribution@android.com> 1338398119 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1338398119 -0700

Reconcile with jb-release

Change-Id: Ibcbaa0404cf8088a9941cc1238f86abfaf73edf1