tree a504e15d18550960a9ef5870f7ee35c54d634321
parent a42770b18a4711f8e453a5bc66306986e5290195
parent fdb084029fbca9cc1e4d449ee4957b171e6d4750
author Treehugger Robot <treehugger-gerrit@google.com> 1523923525 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1523923525 +0000

Merge changes I9fb94f22,I1dfac5ff

* changes:
  Fix androidmk_test.go import ordering
  Add support for android_library modules