tree 284bd7ab265ff3c01419e31b3a448b8bfe8a9c1e
parent cf68343352ffeb702b65d8012d69b8a806fc5620
parent d2a24050da786e9bb32cff9757fb359305d9c108
author Tao Bao <tbao@google.com> 1520455847 +0000
committer android-build-merger <android-build-merger@google.com> 1520455847 +0000

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

Change-Id: I05a7b9c9d32121832acf0b8cafe982b63310d06c