OSDN Git Service

Merge "Fix compile issue" am: 27b56eb03f am: 60c65f1a67
authorJohn Reck <jreck@google.com>
Thu, 3 Aug 2017 00:06:48 +0000 (00:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 00:06:48 +0000 (00:06 +0000)
am: 11d331a2af

Change-Id: I6f293b65cfc734beeafc510baa7121945de208e4


Trivial merge