tree ecae3b1abaa57c09220319de58927782557558f3
parent 01692f629642233384f26e44eab866866a9f37c8
parent 9e04eb2e30bc8d5707c57c2787111b3a5b365fa9
parent 9e04eb2e30bc8d5707c57c2787111b3a5b365fa9
author The Android Open Source Project <initial-contribution@android.com> 1352233152 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352233152 -0800

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

Change-Id: I5aa73c3e5ad4fd272e182c5b46a6c71b4df77a46