OSDN Git Service

Merge "Remove underscore from Companion service name" into oc-dev am: 885b5f4466
authorEugene Susla <eugenesusla@google.com>
Wed, 26 Apr 2017 00:36:49 +0000 (00:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Apr 2017 00:36:49 +0000 (00:36 +0000)
commit43371da3ad6a320f882556dcbbc5cf6320baafd0
treeaec6a831cf4c8376157455a4946aa80522e57af6
parent6c48dfc1510ca5623adca9f5ea500014c0cff5f8
parent56620feed059056e2bf6e04d143eab0b705de289
Merge "Remove underscore from Companion service name" into oc-dev am: 885b5f4466
am: 56620feed0

Change-Id: I3a35f668dde82a8ccb1094988943039b4c93e4fa
api/current.txt
api/system-current.txt
api/test-current.txt
core/java/android/content/Context.java