John Reck 465eefb9f3 Merge "fix race condition between HWUI cache and renderThread" am: 2c2b5e8514 ...

am: 4354ae9883

* commit '4354ae9883ae1282ac457539f46d529bdfa89fec':
  fix race condition between HWUI cache and renderThread

2016-01-19 18:42:21 +00:00

..

java

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

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

jni

Merge "fix race condition between HWUI cache and renderThread" am: 2c2b5e8514

2016-01-19 18:42:21 +00: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