OSDN Git Service

Merge branch 'upstream-master'
authorAlistair Strachan <astrachan@google.com>
Thu, 12 Jul 2018 18:38:52 +0000 (11:38 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Jul 2018 18:38:52 +0000 (11:38 -0700)
am: 5e2c4ec751

Change-Id: Id2b36261424b2297fdd3e65b588a3fb4af128e70


Trivial merge