OSDN Git Service

Merge "Fix mac build" am: a5c3e44663
authorMathieu Chartier <mathieuc@google.com>
Tue, 10 Nov 2015 02:56:53 +0000 (02:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Nov 2015 02:56:53 +0000 (02:56 +0000)
commit8603bc9ee9777d4fb1b5b011d8bb208e02928034
tree3e428fb58fc71079d9bf1f15db75e5f6effaafd9
parentd493a6c4a0c9653a7284bdc291676daf74c24425
parentf110ba8e990d9bda372df7717b8613edebd72ac9
Merge "Fix mac build" am: a5c3e44663
am: f110ba8e99

* commit 'f110ba8e990d9bda372df7717b8613edebd72ac9':
  Fix mac build