Jeff Sharkey 0ab7007631 resolve merge conflicts of 358f0d4fc8c248498cf113c41e043877a14e89a1 to master ...

Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c

2020-12-08 11:01:05 -07:00

..

res

…

src/test/amslam

…

Android.bp

…

AndroidManifest.xml

…

OWNERS

…