tree e8c3cbd3b9474dc6b69a92b2dd0de295a951e2d6
parent 15c4bbddfa2b8597498c2fb960038952f22c3775
parent 7a30a30ebece75f4a73fa604d4c7721d28eecc16
author Jeff Sharkey <jsharkey@google.com> 1449613792 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1449613792 +0000

Merge "Shift around encryption public APIs."