tree 65c721c992b0884b0e9de2f96abfa26a00dff29e
parent a779c08f011c9e048ec94c1f0b5bf9c9884f2a3e
parent 2f4b91c3e408688f2ede7eb8ea44e0d8da5bddb8
author The Android Open Source Project <initial-contribution@android.com> 1349274852 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349274852 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I8982c93b2bd55ff0f0ed334dd37bb4b4ab535197