OSDN Git Service

Merge "Fix SDK build" am: 909fab2235 am: 0951aeb62b
authorDan Willemsen <dwillemsen@google.com>
Sat, 7 Oct 2017 02:03:02 +0000 (02:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 7 Oct 2017 02:03:02 +0000 (02:03 +0000)
am: 563d11e191

Change-Id: I186b72d05d4beb6b60c06912e32f4b0a77571c52


Trivial merge