OSDN Git Service

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

Change-Id: I1f83d7375246e2b84bb3a0f911dfdc5980da76f9


Trivial merge