tree 4ce6ce01cc51483136b8edb6c93f1479d28f0062
parent 28fc78bf5fbb6288a27f3f25565a960a1873b0ef
parent 60b16060612c47386946ee1674bc2149c327bb56
author The Android Open Source Project <initial-contribution@android.com> 1368708221 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1368708221 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Ic457c583534afce9b1697b3b34221a729e2bc5b2