Selim Cinek 47bc04b0b0 Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev ...

am: c5ce69f555

* commit 'c5ce69f555ce703a0bd1d7438e1b87ee9854eae8':
  Fixed a bug where the font sizes where not enforced correctly

2016-03-08 22:27:42 +00:00

..

java

Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev

2016-03-08 22:27:42 +00:00

jni

Merge "Implement glCreateShaderProgramv JNI" into nyc-dev

2016-03-07 18:17:26 +00:00

res

Merge "Notify user when forced to boot into safe mode" into nyc-dev

2016-03-08 18:46:37 +00:00

tests

Merge "Add test for Transition clone." into nyc-dev

2016-03-08 21:03:36 +00:00