OSDN Git Service

Merge \"Fix mac build.\"
authorNicolas Geoffray <ngeoffray@google.com>
Wed, 29 Jun 2016 13:43:10 +0000 (13:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Jun 2016 13:43:10 +0000 (13:43 +0000)
commit1d7726a0e61a63b0720f655b9b0f55c8951bb514
treec68b26ad33a5037834bb9d5246b5c5478eda526b
parentc02552e20b1161f93589cbfdddaff4d018f07bb5
parentc23d6450c92775adf951ee135a5c9515d0f20e30
Merge \"Fix mac build.\"
am: c23d6450c9

Change-Id: I38d3f92361b0176074d08c88e1f1dfae1f6a361a