commit | 98d17c5383043f73e97a4d888f9bb2b18721ddb0 | [log] [tgz] |
---|---|---|
author | David Pursehouse <david.pursehouse@sonymobile.com> | Mon Feb 16 20:03:30 2015 +0900 |
committer | David Pursehouse <david.pursehouse@sonymobile.com> | Mon Feb 16 20:03:45 2015 +0900 |
tree | 87ee08476030d18894a0b1f327d5519398c33ea1 | |
parent | 4c295fd3829725af769dc3c37db9df1c562e24a3 [diff] | |
parent | 97007bfd4da4661369160b9fc29d17ab609908d8 [diff] |
Merge branch 'stable-2.10' * stable-2.10: Consume API version 2.10 Consume API version 2.9 Merge made by the 'ours' strategy. Change-Id: Ic3db1932a0d70542df66847f622f13754c00a3af