OSDN Git Service

Merge "ShortcutManager: Categories should be Set, not List." into nyc-dev
authorMakoto Onuki <omakoto@google.com>
Sat, 16 Apr 2016 15:18:38 +0000 (15:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 16 Apr 2016 15:18:39 +0000 (15:18 +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