commit | 8bfabe2c927d1514c57d616e69836548978dfeef | [log] [tgz] |
---|---|---|
author | Sasha Smundak <asmundak@google.com> | Tue Jan 15 15:22:17 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jan 15 15:22:17 2019 -0800 |
tree | dd3f817573df3b9dd0fa3cd84d79ac9dbca724c6 | |
parent | 968eec498fc7e6950bfe379ee6a0bd737d4047a1 [diff] | |
parent | a9951e0a8906b08e8fa1e493fed7f824e47be5c8 [diff] |
[automerger skipped] Merge "Convert Android.mk file to Android.bp" am: 0081b3831b am: 57c754bc37 am: a9951e0a89 -s ours am skip reason: change_id Idb03dd371284aec57ed356c6091965672b7b95f5 with SHA1 3a60018717 is in history Change-Id: I1b2afaf9404fdac2707787eb01b0e60bb15ab806