OSDN Git Service

Merge "Use commas to separate API exemptions list, not colon." am: 2fddfcdced
authorMathew Inwood <mathewi@google.com>
Wed, 28 Mar 2018 18:46:42 +0000 (18:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Mar 2018 18:46:42 +0000 (18:46 +0000)
commit33be0a8ca3f45430d89e359af58611d42120a703
treeee81f302382e9a26fe4d13fa1b4be79665d16e46
parent1edf1e19cf040621231d208eca17c1c8ecb5323d
parent9f85ad8c996b248082d473f76dfec93764210b80
Merge "Use commas to separate API exemptions list, not colon." am: 2fddfcdced
am: 9f85ad8c99

Change-Id: Idc8adc6ccc505b1264cc8e26c76f067ae4abca1f
services/core/java/com/android/server/am/ActivityManagerService.java