tree 14c3aabb1763545f982b0a3e1a8162ec7f48c47d
parent 1eb20e1bdaee29243f0738731d1de7e3c3e395c4
parent e422b0b29f9fc61ffca1578503a06b8d924a462a
author Tianjie Xu <xunchang@google.com> 1475172601 +0000
committer android-build-merger <android-build-merger@google.com> 1475172601 +0000

Merge "Log the error when uncrypt timeouts" into nyc-mr1-dev
am: e422b0b29f

Change-Id: I8f12be5048b6022a8f2422a9a5e8121ede9daa1c