OSDN Git Service

Merge "Use commas to separate API exemptions list, not colon."
authorMathew Inwood <mathewi@google.com>
Wed, 28 Mar 2018 18:38:48 +0000 (18:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Mar 2018 18:38:48 +0000 (18:38 +0000)
commit9f85ad8c996b248082d473f76dfec93764210b80
treeb75dfdf155a4119fa9b8cce1a02b467599ce0fc2
parentb3673e969897293ef21ffca36814892a60018697
parent2fddfcdced436842cd07b6a52f0a2988d4fbb93c
Merge "Use commas to separate API exemptions list, not colon."
am: 2fddfcdced

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