OSDN Git Service

Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev
authorRubin Xu <rubinxu@google.com>
Tue, 23 May 2017 01:51:08 +0000 (01:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 01:51:08 +0000 (01:51 +0000)
commit90c197d35da29b6dc470b4f060a6ccfbfe15425c
treec5aa5e25889f276060f4001a035072cf464abce4
parent58fa4b99ad5a2d66fbd461a03ddc0443d153296b
parentda3d71f01e5e5da0601c88d92076062d1d985176
Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev
am: da3d71f01e

Change-Id: I8000419d8abd92b247b7de6b5816cc43883facd1