diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-08 22:12:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-08 22:12:38 +0000 |
| commit | bd877f261bfd0cc4b15138e9d6f88ef8337031bc (patch) | |
| tree | 3b717498d97b1f0c251065f23d34635d3194b92f /tools/aapt2/diff/Diff.cpp | |
| parent | 49208d0b9125f78883ad92fc8d4bdc929bdb9403 (diff) | |
| parent | 8ad875f52de3ffa99fea22177e26a7f22c3735b1 (diff) | |
am 8ad875f5: am 0649c832: am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API."
* commit '8ad875f52de3ffa99fea22177e26a7f22c3735b1':
Add BlockMode.GCM constant to AndroidKeyStore API.
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions