OSDN Git Service

Merge "Remove duplicates in Security Settings" into oc-dev
authorMatthew Fritze <mfritze@google.com>
Tue, 23 May 2017 22:21:18 +0000 (22:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 22:21:18 +0000 (22:21 +0000)
commitc9f9961d8de24b00984e4d3e57ecefb56d638812
tree21a874c5b4e9345a992615ebe804e5a96a6ff8fe
parent150fa397fcf04b3fd598e1995db1a71ea7461a56
parent96a8dffafbb8c5fe8cf505427d9f2baf00edc965
Merge "Remove duplicates in Security Settings" into oc-dev
am: 96a8dffafb

Change-Id: I1e987af06d086fd971e2865d5fa854b58ce0e409