tree 515d0a75f7bf43b802fb3247f3ce86efa7526af8
parent 6b435003896d7bd421b32ae7b36a003967994652
parent 8b3b47ee437ace527521892a8dc31ace384962df
author The Android Open Source Project <initial-contribution@android.com> 1364320161 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1364320161 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: If7f39233ef7f924e88683aa3fbb7d4e99ab30a4c