OSDN Git Service

Merge "Really fix the mac build." am: ada33eb9b4
authorChristopher Ferris <cferris@google.com>
Thu, 13 Jul 2017 06:20:25 +0000 (06:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Jul 2017 06:20:25 +0000 (06:20 +0000)
commit8259929a3d19d03fd85d6a7973578da4da7d9c79
treed9a4adbc1947a10392b0491bb527e778fc217f9a
parentccf5bfe492e2faf4a2f3c7cfcd7311df044eab10
parenta95aade379d91f6a35bc99619afd31e9eb0e6379
Merge "Really fix the mac build." am: ada33eb9b4
am: a95aade379

Change-Id: I737b32cb43842c859bd7fc4eec7c5b7ab390b511