tree 34349145ea386f6b6b743c383d7aa9e7f68bd146
parent a811d7a8e638ca49aee704c613cb9f1e03c3698d
parent b5f1e0307998dfee5d1dce27c608da21f46cb156
parent f29c214d6ad97f9a5348407cc66a58aec2228ca9
author The Android Open Source Project <initial-contribution@android.com> 1352229121 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352229121 -0800

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

Change-Id: I8a58a6aebc81829d15af6802f16d956cad2d39c8