OSDN Git Service

Merge "Make failure to set addrgenmode a non-fatal error." am: 9c170157a8
authorLorenzo Colitti <lorenzo@google.com>
Mon, 10 Jul 2017 13:54:41 +0000 (13:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Jul 2017 13:54:41 +0000 (13:54 +0000)
am: 97e7afe8d0

Change-Id: Icadae1e993287fd54e3c5f96b6773d713b8a1e6e


Trivial merge