tree 6ffd29de522b26b5e678ac9e4784d85896ea08ea
parent 42ea4dc6d1fc2206a7778029070ed9213e3b0fbf
parent 10d08a85a382fb90fbddab29b7d0b2de0ac2c98a
author Sasha Smundak <asmundak@google.com> 1547543943 -0800
committer android-build-merger <android-build-merger@google.com> 1547543943 -0800

Merge "Convert Android.mk file to Android.bp" am: 9d9163f90c am: 5bdef0eb24
am: 10d08a85a3

Change-Id: I35426b52a29c30c9a1b425a52625ec88f480b953