tree e7098b501fc7f807311782038e106ae5796314a9
parent 3a60b223d1292889a4d3ce74de4125fb50536639
parent 2ef907c3f04266330e605618af8b022f276f1ed8
author The Android Open Source Project <initial-contribution@android.com> 1348506836 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348506836 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I9e84674df384d2ceea8a1cb357c4f18db0c62ed9