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)
commite625c2f64e95cf343d1e5f11c0787fd1c1b43a20
treea33331abfd2bd23e488f9ef500294878a49c024b
parentc46b5e60b9e3e6552d6db485a1fa5e53cb40d36f
parentf25a418e2427bfc724e9b3a8e9b04f5960bc26a8
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2  -s ours
am: f25a418e24

Change-Id: I3e1b36b906f137b9960b25c8c6de61e31f751804