tree f4969b8f496d17ca2985ad74c9ef873b20520844
parent f6fc6390084c96b7b46228d868cb03607149bd4c
parent e022f6e9f1401a4e58b74d3552c70d80afb7c3a7
author David Pursehouse <david.pursehouse@sonymobile.com> 1449208043 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1449208049 +0900

Merge branch 'stable-2.11'

* stable-2.11:
  OnStartStop: Remove unused config member variable
  MotdFileBasedConfig: Remove declaration of unthrown exception
  Supports multi-line MOTD messages

Change-Id: I1ad2fee9ed30604897a47f9f24d7864895338aab