OSDN Git Service

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

Change-Id: Ib410f96a0b73d5fcdfda1002d7f7c1563b6eb634


Trivial merge