tree 6eb587f93db24d25aa2197feb0820a3fb94e6e78
parent d965c8bc9ae1d5ee893174b0b0ae0414e9359df8
parent 1cc36b670571dd988360d40569a310b2761932f5
author Malcolm Chen <refuhoo@google.com> 1533099438 -0700
committer android-build-merger <android-build-merger@google.com> 1533099438 -0700

[automerger skipped] resolve merge conflicts of 875a3fc05ff6dac1797b44cb6d0f814e9e723dc4 to stage-aosp-master
am: 1cc36b6705  -s ours

Change-Id: I94c2cc39c596572afd71cfdb18d8f3ec42f9833a