OSDN Git Service

Merge "Remove duplicates in Security Settings" into oc-dev am: 96a8dffafb
authorMatthew Fritze <mfritze@google.com>
Tue, 23 May 2017 22:27:01 +0000 (22:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 22:27:01 +0000 (22:27 +0000)
commit7f2d779e15b710756371b4b3550c73af700f2b71
tree1100152f77fa007c49dfe68bd476e16fe5adcd97
parentc29df373bc83ac897dd87d2dc257924300d6cb0d
parentc9f9961d8de24b00984e4d3e57ecefb56d638812
Merge "Remove duplicates in Security Settings" into oc-dev am: 96a8dffafb
am: c9f9961d8d  -s ours

Change-Id: Ia3d2431248eb95bcea9f1b95602e3ba6a2ef0171