Makoto Onuki a1bca975ef Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts," into nyc-dev am: d1c30db548 ...

am: 07f8d94c6e

* commit '07f8d94c6e53cfd7dd389027fc2471ce5ea07846':
  ShortcutManager: When app's data is cleared, remove all shortcuts,

Change-Id: Id5755e333af7552537ddf02c07f0ef12d998b427

2016-04-28 20:18:34 +00:00

..

java

Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts," into nyc-dev am: d1c30db548

2016-04-28 20:18:34 +00:00

jni

resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

2016-04-28 12:08:15 -07:00

res

Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae

2016-04-28 19:25:31 +00:00

tests

Merge "Ensure local settings caches are not stale" into nyc-dev

2016-04-26 18:47:52 +00:00