tree 3b26406b7d7bd1b46aeab830612000c173baa9ae
parent da3dc74f4921727bde74294cae6b4af1a08f5274
parent e17ac1569793c333bb4dce86607a342e7c982ae7
author Jeff Sharkey <jsharkey@google.com> 1447018376 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1447018376 +0000

Merge "More APIs for encryption-aware apps."