tree c75ac15cbdedfe415713609ed458518761cbd813
parent 1fa44dbd7f579e99c48a972d2db3ce14c9da1b14
parent cfef057e7d39ce41985e2534e88483cf8933c367
author Adam Vartanian <flooey@google.com> 1490690995 +0000
committer android-build-merger <android-build-merger@google.com> 1490690995 +0000

Merge "Throw an exception if CipherOutputStream's cipher does."
am: cfef057e7d

Change-Id: I54f217d89182aeefe422868d8a76c231f9171a95