Makoto Onuki d1bc17aacd Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev am: 59cfcb502d ...

am: 2c0af8597d

* commit '2c0af8597dd3edb155893453dbb03027dc95135e':
  ShortcutManager: finishing touches

Change-Id: Id54d01e50b8120b898263a674b1886e2f5c16ac4

2016-05-03 16:45:09 +00:00

..

java

Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev am: 59cfcb502d

2016-05-03 16:45:09 +00:00

jni

Merge "Camera: Update for video buffer binder changes" into nyc-dev am: b99d272e43 am: 4b0fb29261

2016-05-02 18:45:57 +00:00

res

Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev am: 59cfcb502d

2016-05-03 16:45:09 +00:00

tests

Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe am: d4bc15b

2016-04-26 18:54:37 +00:00