OSDN Git Service

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

Change-Id: I0ea93e11cb5bb000aca1fe49f7201d2f70a80e5e


Trivial merge