tree b5eb064d89be6bb49a0e2d0db03ea9d4d2d6ff11
parent 4b6275848c4fbbb4b6e0be009a04ffd3dea9a96d
parent cc7f1318e9a183ec8c443a306eb1d31aa8d08d2d
author Colin Cross <ccross@android.com> 1472674878 +0000
committer android-build-merger <android-build-merger@google.com> 1472674878 +0000

Merge "Enable goma in soong" am: 753ed863c5
am: cc7f1318e9

Change-Id: I329831ecf9e4b38dbf8d7fdb76a9bba3288f5b70