OSDN Git Service

Merge "Change MNC codename to just M." into mnc-dev
authorDianne Hackborn <hackbod@google.com>
Fri, 31 Jul 2015 17:11:58 +0000 (17:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 31 Jul 2015 17:11:58 +0000 (17:11 +0000)
1  2 
api/current.txt
api/system-current.txt
services/core/java/com/android/server/pm/PackageManagerService.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

diff --cc api/current.txt
Simple merge
Simple merge