tree ee0d9384d7259b05ad924e5d61f10dd6eb034d06
parent 677c250ce56e8631751e2a6a58276a0138b20b08
parent efe4dbd1fcd3208d36d886391c7e51eddf1bfa68
author David Pursehouse <david.pursehouse@sonymobile.com> 1412131986 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1412132044 +0900

Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  Avoid throwing exception due to deleted change

Change-Id: I87fc07bd38aa07a02609d5d24afa101366f42406