Merge branch 'open-master' into open-965

Browse Source

Merge in latest into topic branch for WTD-965 to
resolve conflicts.

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css

...

This commit is contained in:

Victor Woeltjen

2015-08-19 14:16:56 -07:00

parent c118234bbf f4b87cf70d

commit a4a9acd2ea

59 changed files with 3090 additions and 667 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

747

platform/commonUI/general/res/css/theme-espresso.css

File diff suppressed because it is too large Load Diff