OSDN Git Service

Merge "Fix Mac build." am: e89385743e am: cbe7d68916
authorElliott Hughes <enh@google.com>
Tue, 11 Oct 2016 04:12:01 +0000 (04:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Oct 2016 04:12:01 +0000 (04:12 +0000)
commit8c2b7620f94363eba3b8ff4f74f2dc4e9bf13747
tree290f56d98cea158fcf455d65a108f535c210e470
parentae33b48b2cc778f2d504ce45c13b931e74b9a498
parent76d8f512561bcb16cdfd2b2b1769c4dbe32094c4
Merge "Fix Mac build." am: e89385743e am: cbe7d68916
am: 76d8f51256

Change-Id: I0f93ba5cd644eff7661392353263398e96b483c8