OSDN Git Service

[automerger skipped] Replace ALL_LISTS policy with JUST_WARN. am: a4ba0e442a
authorMathew Inwood <mathewi@google.com>
Wed, 9 May 2018 10:51:37 +0000 (03:51 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 May 2018 10:51:37 +0000 (03:51 -0700)
am: 71ef453a6c  -s ours

Change-Id: I38ccacc9a7e63e38aa26dd7ba4c705d89ffc2c50


Trivial merge