tree 3ad5968d60eff17bb49efa031e289761b3419f51
parent d03387492b859bcca5c01da41d68e64f522aae91
parent 827e113e7e948bd625924154d333abcccd608bd1
author Edwin Kempin <ekempin@google.com> 1478768371 +0100
committer Edwin Kempin <ekempin@google.com> 1478768426 +0100

Merge branch 'stable-2.12'

* stable-2.12:
  Fix loading of CSS file

Change-Id: Ic113220bed59d40c51ffcd1667b73f61e953a7e4