tree 05b24799434017582e3bba41a01d95884a09bcf2
parent ae757e65a913f0bcdebbea4cabc83fefe2079a7e
parent d8d031ab9e47dfd07f4f5a727fa16f594865b576
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1564787342 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1564787342 +0000

Merge changes from topic "am-ac447072eb954fe7949adbd0fdf838c9" into stage-aosp-master

* changes:
  Merge remote-tracking branch 'user/master' am: 8e056f46af
  Fix two build nits am: 33a4c341e4
  Remove a few more files am: 7053edb309
  Remove GPL files am: 94aa887ced
  Add metadata files am: f082a5799a