tree 9a29ddb929a0a37d20695fb0c98f216ff10fc20c
parent 61758696a0ddc0ba7b1253d3da048b73af8fe698
parent 56ffcc4e12ce3f60115f10b535f13b364852b84b
author Andrew Scull <ascull@google.com> 1516205977 +0000
committer Andrew Scull <ascull@google.com> 1516205984 +0000

Merge remote-tracking branch 'goog/upstream-master' into gogo

* goog/upstream-master:
  Update after Android build file defaults refactor
  Updater: use citadeld by default.

Change-Id: I6d12346b5aba2148ff7d2da24a06c211cc300c1a