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)
commit5da430359ff253bb01b755ccbf8d7a4d694d7f9f
treea675561b30bc77b910b99c66e9d469e00bc8ba58
parente1151cce100ce60cc21db00c3b6bbb0598564230
parent905d0d2543d0e9fb847420d9347c05deadd5e67b
Merge "Fix build breakage." am: 29a7fd300a
am: 905d0d2543

Change-Id: I11c15a16cd6abb6fa2ef27bae1371bed62a9a3cb