| commit | 34b66c42e60826f0795af1e3a9e1b4d7e8cc6781 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <david.pursehouse@sonymobile.com> | Thu Oct 24 11:27:58 2013 +0900 |
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | Thu Oct 24 11:29:27 2013 +0900 |
| tree | 4147b4f556834e8e4d04f850a9c5f512ba970944 | |
| parent | e55d199aeefe20d6f8e661a478b3f7ac0c2ba2b0 [diff] | |
| parent | ed31e1c2ad732190f4bfef28d7c2d22de423e2c9 [diff] |
Merge branch 'stable-2.8' A couple of commits from master accidentally got included in the stable-2.8 branch, and have been reverted there. This merge is done with strategy 'ours' to prevent those reverts from happening on master, where the commits are actually wanted. Change-Id: Ie1c16ca13d397483e36759370805bcfb8e83fedb