OSDN Git Service

Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Fri, 3 Jun 2016 15:21:44 +0000 (15:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 3 Jun 2016 15:21:45 +0000 (15:21 +0000)
1  2 
api/current.txt
api/system-current.txt
api/test-current.txt

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