tree 0e745fa9d95e31ffd528b9232fe341a70251f69d
parent 23e034c93d7b42aabd8a8d7c6fe2a913a2691493
parent b3ae2646a2f0198e26ef426abb9fd3c7b465b2cf
author Malcolm Chen <refuhoo@google.com> 1533060725 -0700
committer Xiangyu/Malcolm Chen <refuhoo@google.com> 1533087867 +0000

resolve merge conflicts of 875a3fc05ff6dac1797b44cb6d0f814e9e723dc4 to stage-aosp-master

Bug: None
Test: None
Change-Id: I32fb80dbaad6ace6a989270e14e32284c5b7201e
Merged-In: I5464e4049e8f4e293cca4a9255a99051238101c5