tree 9364ac94c321d2b6a0c3a68846d4bfb8c9d1c26b
parent a45f631f445822b5926f0185b4d540ef684c514c
parent 79fb65bb7b61b3a6702eb5aadca46be45683a2ca
author Jie Song <jies@google.com> 1498010163 +0000
committer android-build-merger <android-build-merger@google.com> 1498010163 +0000

Merge "Update hash and VTS for the 2nd FD of dumpstate" into oc-dr1-dev
am: 79fb65bb7b

Change-Id: Ie20644fd70140817fb67eb361ee382c833728830