OSDN Git Service

Merge branch 'marshmallow-x86_wo_su' into cm-13.0-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Mon, 8 Aug 2016 14:16:13 +0000 (16:16 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Mon, 8 Aug 2016 14:16:13 +0000 (16:16 +0200)
commit0b8c2ea3ec8ed3a086bd02d3246e06564e8a64cb
treece759ab0ef12a53ae79ec7345b7f8539bade2db1
parent9da4d0c8e32cf7cd33e47f23a3e98bb973b79a7a
parent16162a437e85218105a9a1e1129ddbd28b3f5ea9
Merge branch 'marshmallow-x86_wo_su' into cm-13.0-x86

Conflicts:
res/xml/device_info_settings.xml
src/com/android/settings/DeviceInfoSettings.java
res/xml/dashboard_categories.xml