OSDN Git Service

am e6562d90: am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent...
authorDianne Hackborn <hackbod@google.com>
Thu, 28 May 2015 23:01:05 +0000 (23:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 23:01:05 +0000 (23:01 +0000)
commite6ca5b3720f02b86c6dbedfef268e7a5050a1de4
tree34f56257b5a5634b289e29657344619dab2f46f0
parentf002cc6fee0c418832037986ffd35fa5d5bf6f0f
parente6562d903b9e62b4d4c6c08307a39577f15f1c49
am e6562d90: am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev

* commit 'e6562d903b9e62b4d4c6c08307a39577f15f1c49':
  Add new API to set URI on AssistContent.
api/current.txt
api/system-current.txt
services/core/java/com/android/server/am/ActivityManagerService.java