Narayan Kamath 419389c52a am fd335f84: am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment" ...

* commit 'fd335f8467259410c0a55733331e10531141e76e':
  Remove wrong javadoc comment

2015-02-24 10:28:12 +00:00

..

java

am fd335f84: am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment"

2015-02-24 10:28:12 +00:00

jni

Merge "Glop layer mesh rendering"

2015-02-20 19:30:40 +00:00

res

resolved conflicts for merge of 57bb5f5c to master

2015-02-23 21:19:58 -08:00

tests

Normalize deprecated 2-letter language code when necessary.

2015-02-21 02:26:40 +09:00