Muyuan Li b7c69150c8 Merge "Allows components to register shortcut key." into nyc-dev am: 187b9b9e5b ...

am: 1673ab1ead

* commit '1673ab1ead05b452b40380d921d92fcb8ebb5623':
  Allows components to register shortcut key.

2016-02-26 23:20:54 +00:00

..

java

Merge "Allows components to register shortcut key." into nyc-dev am: 187b9b9e5b

2016-02-26 23:20:54 +00:00

jni

Merge "Audio record notification: report audio device information" into nyc-dev

2016-02-26 22:42:26 +00:00

res

Merge "WallpaperManager: support custom default cropper." into nyc-dev am: 203b353018

2016-02-26 22:18:46 +00:00

tests

Merge "Modify WakeupMessage to only send the message if not canceled" into mm-wireless-dev

2016-02-26 00:20:00 +00:00