tree 2408611f39bfe5c4218f4afddb31221446a92087
parent a8af2d3664eab2eae6f670ef0fb79969010c34c3
parent b0e99e147253df35932c8c7c15911d091a07dda1
author Stanley Tng <stng@google.com> 1539799649 -0700
committer Stanley Tng <stng@google.com> 1539800067 +0000

resolve merge conflicts of b0e99e147253df35932c8c7c15911d091a07dda1 to stage-aosp-master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953