tree 6a4bb7fcd9b15e2ace4b2bc4cbb1f258bdb29aa6
parent 5cb9a02b0322c18b48eb9ce261502c3b830c113c
parent cd07446afea9a3e5090eb9a92597794f37f85130
author The Android Open Source Project <initial-contribution@android.com> 1369321548 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1369321548 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I43fb882425fac784151bbf0a313661f3b684ac89