OSDN Git Service

[automerger skipped] Merge "Support Speck encryption." into pi-dev
authorPaul Crowley <paulcrowley@google.com>
Fri, 30 Mar 2018 23:15:37 +0000 (23:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Mar 2018 23:15:37 +0000 (23:15 +0000)
commit9c1fb1bdef6ab7d05db0a881fdd1e69a6c5b2c6a
tree4ccbabfed05f5e488c0fbf1f3bb33d34329ba3ac
parent7271b879d153d1ee95beb441b1bf8bf501b1faec
parent8c2705f568fffc69a6b22707d49771dac627f75c
[automerger skipped] Merge "Support Speck encryption." into pi-dev
am: 8c2705f568  -s ours

Change-Id: Ibda9f2d8c4d90e9d73044e513c1b72ff229765c9