tree dd8f7227d83cc3b71bfb8102be5514ff6ee58160
parent a4d40d299c0cc8e60f9729ae81d8012ce9c9edbf
parent 63f0b01812d3ce058b36eee1fd0ea9fa2676a0b0
author The Android Open Source Project <initial-contribution@android.com> 1345044563 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1345044563 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I4f97bffedf3712fd3c7e07a797d54735a2c456c1