Sami Tolvanen ebbe844952 Merge "Notify user when forced to boot into safe mode" into nyc-dev ...

am: 525032754e

* commit '525032754e69c2b1a40e75254247c26da58f06ee':
  Notify user when forced to boot into safe mode

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

..

java

Merge "Introducing ShortcutManager" into nyc-dev

2016-03-08 18:05:33 +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 hidden slide fraction call to Slide" into nyc-dev

2016-03-08 16:53:58 +00:00