| commit | ee45745fc47e960ea90d51bae4a1d409ceec98fb | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <david.pursehouse@sonymobile.com> | Tue Feb 17 17:49:13 2015 +0900 |
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | Tue Feb 17 17:49:24 2015 +0900 |
| tree | c317b00129fec5b793b638f17cde4390428c52dd | |
| parent | 58a2b3929db7165b4d497d866169fe57c1503c25 [diff] | |
| parent | f7f8d0453fc1aa4e71700275f14eeebfa2bd475e [diff] |
Merge branch 'stable-2.9' into stable-2.10 * stable-2.9: Consume API version 2.9 Merge made by the 'ours' strategy. Change-Id: Idd0d6ee249b61a2ac213c98d1d45426eb1f21ab6