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)
commit905d0d2543d0e9fb847420d9347c05deadd5e67b
treea675561b30bc77b910b99c66e9d469e00bc8ba58
parentdc36c19eebfe06accc3fd31bb644ae12cefff64c
parent29a7fd300a7d462ddf07987272383390c176a1c8
Merge "Fix build breakage."
am: 29a7fd300a

Change-Id: Ib410f96a0b73d5fcdfda1002d7f7c1563b6eb634