Tobias Thierer f6bcab7f97 Merge \"Changes for upgrade to OkHttp 2.7.5\" ...

am: a31247bd8d

Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280

2016-06-30 12:49:47 +00:00

..

java

Merge \"Changes for upgrade to OkHttp 2.7.5\"

2016-06-30 12:49:47 +00:00

jni

Merge \"Remove FD from the right Looper\" into nyc-dev

2016-06-23 18:39:44 +00:00

res

One final tweak to the platlogo.

2016-06-28 07:07:31 +00:00

tests

Merge \"Update DisplayMetrics when resizing\" into nyc-dev

2016-06-24 23:42:34 +00:00