tree 0070300195d3ad360fef5ad2e84118b06ac36d79
parent aef62d1e6c204aedc43a3cb90b84cd899566fe46
parent 38d254358dadc01b8e11e8d4a2a5e6bbf9c2c780
author Andrei Onea <andreionea@google.com> 1563823347 -0700
committer android-build-merger <android-build-merger@google.com> 1563823347 -0700

[automerger skipped] resolve merge conflicts of 1faafcb48830a01765c9b84792505565a6d3fafb to stage-aosp-master am: d7ecd0d24d -s ours am: 711f375337 -s ours
am: 38d254358d -s ours
am skip reason: change_id I981067477f6f4aa435459c0bc9a52099e6f5d445 with SHA1 c014fb5ca9 is in history

Change-Id: Ic01b6410f413a4b44f59955691399d9895c00c43