tree 4eae4b85b4d2497a7c8fcbbbe3ad849072ccb372
parent ec520cf757e7c27764b537abf5e7a82315fbcc5a
parent c640e2c46a3676d397545fa882388c6fa02a25b0
author Justin Klaassen <justinklaassen@google.com> 1487276967 -0800
committer Justin Klaassen <justinklaassen@google.com> 1487276967 -0800

Merge remote-tracking branch 'goog/ub-deskclock-gatling'

Bug: 35405410
Test: lunch aosp_bullhead-userdebug && make -j24
Change-Id: I8e51683a7710bc88141dbcd9bbfce5693454ec80