tree f75aeb6ceacd1ca2d464da7af976a6c6856f4026
parent 8f03b8612092976d195e35ca6f04810399d1d03d
parent 19bd39fe3ff95b1f2fe987d1925f8eb29117677e
author Tao Bao <tbao@google.com> 1517444812 +0000
committer android-build-merger <android-build-merger@google.com> 1517444812 +0000

Merge "releasetools: Move the AVB salt setup into common.LoadInfoDict()." am: 4b4c3d91b0
am: 19bd39fe3f

Change-Id: I4b8271f022b7c27420cf8b0b6532b2cced0bd44f