OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 442a4e4 4f86a89)
Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev
authorRubin Xu <rubinxu@google.com>
Tue, 25 Apr 2017 13:50:10 +0000 (13:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Apr 2017 13:50:10 +0000 (13:50 +0000)
am: 4f86a894e1

Change-Id: I0947dbaa1eb840bffd7299d9fe8a9f6aea118a47


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help