tree 0eb2e59d289f29995ce6f803f633ab960bfdea86
parent 9545b6707e8c2213806c71fa9b0cae608b8bc032
parent f3bddaf31b090e187474f22c4bc3ce9dcd0b461a
author The Android Open Source Project <initial-contribution@android.com> 1369232573 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1369232573 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I2a95a80d2225eb4a27e8bab567f3838b838daf70