tree 4c17bdbc93e22a0904d50fac7cb8df423cae3b28
parent f87e5cd57a7d543c54327e342cea7f46fd819a90
parent f7006be5079ed91c93223273f3ddb69d655ba858
author Sen Jiang <senj@google.com> 1520561232 -0800
committer Sen Jiang <senj@google.com> 1520634739 -0800

Merge remote-tracking branch 'aosp/upstream-master'.

Bug: 30989362
Test: update_engine_unittests
Change-Id: I04417ac21508f4da3ead29b1dea34886f2fc84af
Merged-In: I04417ac21508f4da3ead29b1dea34886f2fc84af