OSDN Git Service

Merge "Fix build breakage." am: 29a7fd300a
authorNicolas Geoffray <ngeoffray@google.com>
Tue, 4 Oct 2016 22:16:05 +0000 (22:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 22:16:05 +0000 (22:16 +0000)
am: 905d0d2543

Change-Id: I11c15a16cd6abb6fa2ef27bae1371bed62a9a3cb


Trivial merge