tree 21d3e3f61b535186b8de7afe162febff4f4aff11
parent 25bd47ac7862c1ef0dd62684d4569bd43be51985
parent f093798a61ed90b68c14b86e7fb8c88d375ce51a
author Stanley Tng <stng@google.com> 1539873333 -0700
committer android-build-merger <android-build-merger@google.com> 1539873333 -0700

[automerger skipped] resolve merge conflicts of 23ccecc4ca9f58139baa72bd4783451b780b1eb5 to stage-aosp-master
am: f093798a61  -s ours

Change-Id: I326a2c1c34ad8909f5056de5d79fb08b48b18aed