OSDN Git Service

am 3548b43f: am 2a638d29: Merge "Add Intent to configure ConnectionService" into...
authorEvan Charlton <evanc@google.com>
Mon, 14 Jul 2014 21:44:35 +0000 (21:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Jul 2014 21:44:35 +0000 (21:44 +0000)
* commit '3548b43ff8b8f36549ec74b766446d619deb157e':
  Add Intent to configure ConnectionService

1  2 
api/current.txt

diff --cc api/current.txt
Simple merge