Jorim Jaggi cdfca9c3d2 Merge "Handle case when snapshot dimensions don't match" into oc-dev am: 1edadac465 ...

am: 05ca99b43b

Change-Id: Ie5364d5617a159344d5232e48957ffd79a89a175

2017-04-04 09:32:02 +00:00

..

java

Merge "Handle case when snapshot dimensions don't match" into oc-dev am: 1edadac465

2017-04-04 09:32:02 +00:00

jni

Merge "ANativeWindow_toSurface implementation" into oc-dev am: 7e5d2c23a4

2017-04-04 04:51:43 +00:00

proto/android

…

res

Merge "Handle case when snapshot dimensions don't match" into oc-dev am: 1edadac465

2017-04-04 09:32:02 +00:00

tests

Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev am: ef7dff2563

2017-04-03 20:01:58 +00:00