Andrei Stingaceanu 9e16d11683 Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev ...

am: 1a83df8ba7

* commit '1a83df8ba716d027ac26c9198ed3d3b8d2b98ad1':
  Keyboard shortcuts: dismiss when activities start via shortcut

Change-Id: I90368ac50ef49535bda0f4babfc80e120fe72f89

2016-04-22 17:01:46 +00:00

..

java/com/android/server

Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev

2016-04-22 17:01:46 +00:00

jni

Merge "Added defensive code to prevent system crash" into nyc-dev

2016-04-20 22:30:55 +00:00

Android.mk

Merge "Move UidRange aidl declaration to system/netd" into nyc-dev

2016-04-19 19:19:43 +00:00