OSDN Git Service

Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev am: da3d71f01e
authorRubin Xu <rubinxu@google.com>
Tue, 23 May 2017 02:01:11 +0000 (02:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 02:01:11 +0000 (02:01 +0000)
commit32529ec660690e43d8233aa73ef360b69f08327c
tree9f7a41b473602234db9b9f47c8954fdd761091c0
parent29a3a7931c217003d852155691c10019a892725a
parent90c197d35da29b6dc470b4f060a6ccfbfe15425c
Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev am: da3d71f01e
am: 90c197d35d  -s ours

Change-Id: If43d86a65d7b8d8d210bc64e9772b532374d7662