tree 988009f9109498cdf19b51b3864f805744d6ea57
parent c1e291d71ba0ad0d2b134fd77f7700df6f6484da
parent 50da911fda64205677571d9cb1d668336cfb0f7f
author Paul Crowley <paulcrowley@google.com> 1461808179 +0000
committer android-build-merger <android-build-merger@google.com> 1461808179 +0000

Use a longer timeout on the disk encryption keys am: b3de337 am: 409c083
am: 50da911

* commit '50da911fda64205677571d9cb1d668336cfb0f7f':
  Use a longer timeout on the disk encryption keys

Change-Id: I43279eb3a1bd92839c2d742acc95cb96c920b5dd