Makoto Onuki 09c6612288 resolve merge conflicts of 8de7c95 to master ...

Change-Id: I04447215323c7582554dc5f6ae8b105308c6f623

2016-05-27 16:10:34 -07:00

..

servicestests

resolve merge conflicts of 8de7c95 to master

2016-05-27 16:10:34 -07:00

shortcutmanagerutils

ShortcutManager: Support manifest shortcuts

2016-05-27 09:40:58 -07:00

Android.mk

…