OSDN Git Service

Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest"
authorFan Zhang <zhfan@google.com>
Fri, 22 Dec 2017 01:13:32 +0000 (01:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Dec 2017 01:13:32 +0000 (01:13 +0000)
am: 7c46a79a00  -s ours

Change-Id: I83bb99c73fcd2818105b51633ea8c5c42bcd74a0


Trivial merge