| commit | 01c25f26c4d39a50f2aa0a78cc70196df4f79f82 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <david.pursehouse@sonymobile.com> | Wed Dec 02 14:10:13 2015 +0900 |
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | Wed Dec 02 14:10:28 2015 +0900 |
| tree | 3eb202b01b2718a014394918f744aa4592eefcf8 | |
| parent | 36f18d93d241b43411e2223f75bc00a817e47554 [diff] | |
| parent | f875eebbc6fdf51d61dcad5820bb0a1a4fbccf62 [diff] |
Merge branch 'stable-2.11' * stable-2.11: Build with API version 2.11.5 Build with API version 2.10.7 Build with API version 2.9.4 Merge made by the 'ours' strategy to avoid conflicts. Change-Id: I12a4d3a07d8ba3cbcf0529497b8bd49401071fb8