tree 3992a0493b1867a6c78b0adb7a8e71b6f8f517a9
parent 8e6b20f4f3e841952e210222442c9756e039a471
parent 458d16bcedf0e7c63481a0d62eb1aea66377a431
author Neil Fuller <nfuller@google.com> 1551703588 -0800
committer android-build-merger <android-build-merger@google.com> 1551703588 -0800

Merge "Use new libcore filegroup variable" am: 898caeeaed
am: 458d16bced

Change-Id: I692b7bfbc5e7bdd8b44e26d2d55862bf725d141b