diff options
author | Alex Klyubin <klyubin@google.com> | 2015-05-19 16:20:09 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-19 16:20:09 +0000 |
commit | df5f7792f3d3ff63fa649e5899e71d44b8df1099 (patch) | |
tree | fe6ea6ec82275c38450a27fe033b0d17d5c5dede /rs/java/android/renderscript/Allocation.java | |
parent | b1de5bf2df19e4c23cec8912d29ff2dfd5563b00 (diff) | |
parent | 0b1165c046b7787b9ed1c2bee1537a9adf51cbe7 (diff) |
am 0b1165c0: am 29542143: Merge "Document the security features of Android Keystore." into mnc-dev
* commit '0b1165c046b7787b9ed1c2bee1537a9adf51cbe7':
Document the security features of Android Keystore.
Diffstat (limited to 'rs/java/android/renderscript/Allocation.java')
0 files changed, 0 insertions, 0 deletions