OSDN Git Service

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

Change-Id: I945c60246148e2031c7921010e1b144a32fe2be6


Trivial merge