OSDN Git Service

Merge "Fix mac build"
authorColin Cross <ccross@android.com>
Fri, 16 Sep 2016 01:04:19 +0000 (01:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Sep 2016 01:04:19 +0000 (01:04 +0000)
commitec2f94c40a1e5b1ec7b8ffc1ace50d296209660e
tree5d940de86eb8cf79f6a9741826c6040d63f2ee28
parent8c1dac4ebf4a0845318a4f37b7b03f049340b6fd
parent175a9be49d13e0a2740b378abf3aac11d7fbaa6e
Merge "Fix mac build"
am: 175a9be49d

Change-Id: I57ec257f1b84fffc9e201953981e2ac4a12e4fd0