OSDN Git Service

am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev
authorDianne Hackborn <hackbod@google.com>
Thu, 28 May 2015 22:35:39 +0000 (22:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 22:35:39 +0000 (22:35 +0000)
commite6562d903b9e62b4d4c6c08307a39577f15f1c49
treeee5e254e5e1647fe39f517b839a7b50b80173407
parent1ca3ddb070dd53d33b788a34d446b003bdf73b36
parentda71e1004082427e36db21c39f47b13e0afa8ed4
am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev

* commit 'da71e1004082427e36db21c39f47b13e0afa8ed4':
  Add new API to set URI on AssistContent.
services/core/java/com/android/server/am/ActivityManagerService.java