Makoto Onuki c4e64bc449 Merge \\"ShortcutManager: deal with changing resource IDs on app update\\" into nyc-mr1-dev am: 3bb4366006 ...

am: a3a56ab9d1

Change-Id: Id5e39a35db803223a89100a8e23a7b3309cd9dd3

2016-06-08 17:23:34 +00:00

..

java

Merge \\"ShortcutManager: deal with changing resource IDs on app update\\" into nyc-mr1-dev am: 3bb4366006

2016-06-08 17:23:34 +00:00

jni

Rename PointerIcon and Pointer Capture APIs

2016-06-04 02:20:21 +01:00

res

Merge "Import translations. DO NOT MERGE"

2016-06-07 02:27:55 +00:00

tests

Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev am: 3e2bfbd135

2016-06-08 06:44:24 +00:00