Hugo Benichi b8a9892344 resolve merge conflicts of 514da60 to nyc-mr1-dev-plus-aosp ...

am: 524b2e4f30

Change-Id: Ia0a4544784592ac857e5bd652fee47eec621f3a0

2016-07-26 15:18:51 +00:00

..

java

Avoid destroying TextureView surfaces for onStop am: 391d560402

2016-07-26 15:18:45 +00:00

jni

[WIP] Use non-fast JNI for Canvas.native_drawBitmap.

2016-07-25 13:52:28 -07:00

res

resolve merge conflicts of 514da60 to nyc-mr1-dev-plus-aosp

2016-07-26 15:18:51 +00:00

tests

Fix ResourcesManagerTest to use Configuration#setToDefaults()

2016-07-22 16:57:10 -07:00