tree 9efe68751c858de127b9fe242f4282cd183ec70a
parent 0b02d05f1e2968643c42d10841dccedb63d33c48
parent d553ad32eb1d4fa3c02c0ca1aebb5e09fe0c2760
parent d553ad32eb1d4fa3c02c0ca1aebb5e09fe0c2760
author The Android Open Source Project <initial-contribution@android.com> 1352233164 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352233164 -0800

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I0a50c89812fb0f6e635a02ed4c9db690d749e3cf