tree 8498ef2602f4559543db92250cfa2e523adf5c35
parent 85d17d0a9a2000ea7b4ffefc6d28a25be81a05ff
parent 371cf3ce5e35310cba324692ec1876b87c13aa63
author Anton Hansson <hansson@google.com> 1575316121 -0800
committer android-build-merger <android-build-merger@google.com> 1575316121 -0800

Merge "Put all updatable sources in one filegroup" am: 0223efdaa1
am: 371cf3ce5e

Change-Id: I57d7442c503d60f9f8c4935e63be456327f09574