OSDN Git Service

Merge remote-tracking branch 'aosp/android-7.1.2_r17' into nougat-x86