tree aa51be60d87698511d570903783f350517de6dd9
parent 3d8bdd63056435296a4d98eb4f2567c6f40d16fc
parent 934fbffae25e50e49d4143b082f100dbbe4c9e80
author The Android Open Source Project <initial-contribution@android.com> 1340111632 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340111632 -0700

Reconcile with jb-release

Change-Id: If9e036e4156d80d4990cb53a8f7a259df27fb7ce