tree e490496b88e1f903ef9dfd710e30199b81990404
parent 5ad6990de14227b87679b15a5197f4af6c3ba3bd
parent 877b8e2942bf4895310a1af597929a0512e092f2
author David Pursehouse <david.pursehouse@sonymobile.com> 1449476296 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1449476296 +0900

Merge branch 'stable-2.11'

* stable-2.11:
  Remove support for deprecated config format

Change-Id: I94243d04aa167c5a7b846d0f16dbf9d7a65b506e