OSDN Git Service

Merge tag 'android-6.0.1_r66' into HEAD
authorJessica Wagantall <jwagantall@cyngn.com>
Wed, 7 Sep 2016 19:40:29 +0000 (12:40 -0700)
committerJessica Wagantall <jwagantall@cyngn.com>
Wed, 7 Sep 2016 19:40:29 +0000 (12:40 -0700)
commitabcf8652e4d308d51110fafd00ecc90f9b607d83
tree94ea5631c76fe3c362bf668b35dd4e5bd97f1d42
parent333ca009c5e8c1c591b2a50351f2a18841a9e7ed
parent2169505c9a9300ca564a39d218b80dcfefc76c2a
Merge tag 'android-6.0.1_r66' into HEAD

Android 6.0.1 release 66

# gpg: Signature made Tue 06 Sep 2016 09:27:08 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
src/com/android/settings/SettingsActivity.java
src/com/android/settings/users/UserSettings.java