tree 284bd7ab265ff3c01419e31b3a448b8bfe8a9c1e
parent 15bc28727a2fb7870e0cf6f125a370afc0b6ff89
parent 2d62142fff217e7bc1cd536b44f11336075e515f
author Tao Bao <tbao@google.com> 1520455457 +0000
committer android-build-merger <android-build-merger@google.com> 1520455457 +0000

Merge "Drop the no-op Android.bp." am: 242d41b808
am: 2d62142fff

Change-Id: I9b480f80355188f4904f5a907090e64d7cfa4a7d