tree 8fe3275856fa8d4575ca689e4c9b848733766931
parent 5b1202976eeedbcca5041416dff043d9233d5e1f
parent 74a5f22d9f6a195a663f0fcb971e96b067446a2a
author Luke Song <songwalker@google.com> 1500513931 -0700
committer Luke Song <songwalker@google.com> 1500513951 -0700

resolve merge conflicts of 74a5f22d9 to oc-dr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.

Change-Id: Iad367b2998311e327151dbd8e9295259f6661f77