tree b7bb3036fcdb1af70a12e1c11fb18f0139dddb94
parent 6d12c65cb7160eb230945a5e74d874a5aaf2048c
parent 2cefddbce59e5029a7c753b885b9c4e454862061
author Andreas Huber <andih@google.com> 1507059075 +0000
committer android-build-merger <android-build-merger@google.com> 1507059075 +0000

Merge "Fix mac build." am: 5da045dc1a
am: 2cefddbce5

Change-Id: I5027f40f9d13186a8670712b9f44105b3329ee5f