OSDN Git Service

Merge "Fix mac build" am: c520f85302
authorColin Cross <ccross@android.com>
Mon, 19 Sep 2016 20:03:38 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Sep 2016 20:03:38 +0000 (20:03 +0000)
commit68bf4b5b2029ee7de8630b6162a123f93daf5e2e
tree6362559987281ebf0be863744de1c35fbcb6bbb2
parent49a898e16c0151cf0558a09d17a1745946cef7cc
parentfa6a372b212bac05e459b8a4bf0260113284f9e4
Merge "Fix mac build" am: c520f85302
am: fa6a372b21

Change-Id: I9ac106f68bbe752c6f7eca658a2c799169836e0f