tree f0fe30e58399652523b050e047053d2bcf2ac9c1
parent c719603ee9560f38eba6686e922a365b8e6cbce2
parent 32d40d0d4d4c61782d6cb7bc6f2d18018bd8e17a
author The Android Open Source Project <initial-contribution@android.com> 1364320192 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1364320192 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I237e3ce93b4ac39863d248d54690c71c08721aaf