Jeff Davidson 1eb5ca609a am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183 ...

automerge: 38e8763

* commit '38e8763df55ebedcf65178f8acced806113af4a5':
  Add global setting for ephemeral network timeout.

2014-12-17 21:05:53 +00:00

..

java

am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183

2014-12-17 21:05:53 +00:00

jni

am 8b3df1f9: am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java."

2014-12-17 19:48:49 +00:00

res

Merge "Revert "Allow theme attributes in <include> tag, fix <tag> context""

2014-12-17 18:56:50 +00:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00