Narayan Kamath 3ec5f97ac5 Merge "Conditionally include org.apache.http.legacy in app classpaths."

2015-02-05 12:45:24 +00:00

..

java

Conditionally include org.apache.http.legacy in app classpaths.

2015-02-05 12:10:06 +00:00

jni

Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas"

2015-01-30 14:25:24 +00:00

res

am eeb69d17: Move layer-list to be top-level element in seek bar progress automerge: bac8e12 automerge: 6708ac4

2015-02-05 03:50:28 +00:00

tests

Merge "Adapt to change of LOCAL_USE_JACK values"

2015-02-05 11:01:36 +00:00