tree d3aff115acfe8eb729dd38d1586e7caee3dbde4d
parent 86ad067783adf0e7e2df389bd625f0687890caad
parent 57826c17631d327f1ebb46b7ad41e7811042e448
author David Pursehouse <david.pursehouse@sonymobile.com> 1436250885 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1436250891 +0900

Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Remove support for deprecated config format

Change-Id: I8740de54f7222b7a7254f99e3291df9a7f0d6a6c