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)
commit4573dddcce3f232d2eeb20bfe0e204e15a9416e9
tree2ffa4bac4aff27239990db0e2761473b18a61bfa
parentbf7fe1e051fefc5e6c1b96411a842b0305a9192c
parent09d57fe9b357495b7bc62be39a8befa00d9d7ffb
Merge "Add new API to set URI on AssistContent." into mnc-dev
api/current.txt
api/system-current.txt
services/core/java/com/android/server/am/ActivityManagerService.java