tree 0e878381eab60ddef7b43ede546e9f34991a4450
parent 2d127a1d4ab9717c8460e6a508bd5e893013e8fa
parent 0305fcecc5b1a9f8172ca1753a29b6963e7bb474
author Tao Bao <tbao@google.com> 1452737131 +0000
committer android-build-merger <android-build-merger@google.com> 1452737131 +0000

Merge "uncrypt: avoid use-after-free"
am: 0305fcecc5

* commit '0305fcecc5b1a9f8172ca1753a29b6963e7bb474':
  uncrypt: avoid use-after-free