John Reck 411e2ee4d9 Merge "Revert "Switch to new rendering pipeline""

2016-01-19 17:48:22 +00:00

..

java

Merge "NFC: Allow apps to specify they're done with tag."

2016-01-19 15:32:36 +00:00

jni

Revert "Switch to new rendering pipeline"

2016-01-19 09:44:39 -08:00

res

Import translations. DO NOT MERGE

2016-01-18 18:43:11 +01:00

tests

Merge "Add AutoCancelTest back to framework tests"

2016-01-19 17:33:14 +00:00