OSDN Git Service

Merge "Use separate switch ops for runtime permissions am: e710a6fc66 am: a2bbc26979...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Jan 2017 01:48:12 +0000 (01:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 01:48:16 +0000 (01:48 +0000)
commit583d798e41ec5e4d05f99231e4aa83804a8376bf
tree6deb5841ba650a6b981e84f502d6235aa4d1e6d4
parentc6107e1834d1a8ea2ee9eb675291aa724514fa26
parent49dc9048fd1acea33bfa1b8ce3f16192b0af174c
Merge "Use separate switch ops for runtime permissions am: e710a6fc66 am: a2bbc26979" into nyc-mr2-dev-plus-aosp