OSDN Git Service

Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours
authorNick Desaulniers <ndesaulniers@google.com>
Wed, 16 Aug 2017 18:37:21 +0000 (18:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Aug 2017 18:37:21 +0000 (18:37 +0000)
am: f25a418e24

Change-Id: I3e1b36b906f137b9960b25c8c6de61e31f751804


Trivial merge