tree 36133dc848cda71cbf10ba415431185a67a3bb12
parent eaba92c92c2f341091f658609ff3f8c4b11a37d4
parent d35542316dc2b5a3254419746744d6f3fc7aa5dc
author Sen Jiang <senj@google.com> 1515791490 +0000
committer android-build-merger <android-build-merger@google.com> 1515791490 +0000

Merge "Specify --max_timestamp when calling brillo_update_payload." into oc-dev am: 4378910f30
am: d35542316d

Change-Id: I3a0096432cad3dad8fd283ace19fc21d64d9c42e