Jeff Sharkey ba05b1ecb0 Merge "Disable StrictMode when starting activity." into nyc-dev ...

am: a3331309a9

* commit 'a3331309a9f29cf4e3676b1a6a230148eaf04fe1':
  Disable StrictMode when starting activity.

2016-02-16 17:00:06 +00:00

..

java

Merge "Disable StrictMode when starting activity." into nyc-dev

2016-02-16 17:00:06 +00:00

jni

Merge "use std factory for compose-shader" into nyc-dev

2016-02-16 14:51:36 +00:00

res

Merge "Add feature versions for devices and apps." into nyc-dev

2016-02-16 00:53:15 +00:00

tests

Merge changes I0f79243e,Ia27e19f9,Iec6b89f0,I276c7eb0 into nyc-dev

2016-02-16 16:11:50 +00:00