Dianne Hackborn 094f08efa1 Merge "resolve merge conflicts of 3aee38c86e to master."

2015-11-03 21:51:07 +00:00

..

java

resolve merge conflicts of 3aee38c86e to master.

2015-11-03 12:47:12 -08:00

jni

Revert "Check GLES2 support using EGL instead of qemu.gles"

2015-11-03 20:39:51 +00:00

res

Merge "Load WebView from one out of a list of packages, reland."

2015-11-03 17:50:07 +00:00

tests

Merge "Fix failing TextActivityTest."

2015-11-03 16:06:38 +00:00