OSDN Git Service

Merge "Add new API to set URI on AssistContent." into mnc-dev
authorDianne Hackborn <hackbod@google.com>
Thu, 28 May 2015 21:35:40 +0000 (21:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 28 May 2015 21:35:41 +0000 (21:35 +0000)
1  2 
api/current.txt
api/system-current.txt
services/core/java/com/android/server/am/ActivityManagerService.java

diff --cc api/current.txt
Simple merge
Simple merge