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)
commit0d41d268684a339ae76309b193610bdcbdbbbe69
treed90706cf60bf72cbd31fce2a9d4e9cf7e8b1a53e
parentfead84d8ff84b439eb28602f310bf00bf3c5ceb1
parent5e2c4ec75165b5b167d9a4192ade2b6f62ceb3ad
Merge branch 'upstream-master'
am: 5e2c4ec751

Change-Id: Id2b36261424b2297fdd3e65b588a3fb4af128e70