Merge "Fix android build compatibility problems"
authorPatrick Lankswert <patrick.lankswert@intel.com>
Sat, 27 Dec 2014 22:38:05 +0000 (22:38 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Sat, 27 Dec 2014 22:38:05 +0000 (22:38 +0000)
commit8186f898a3a68c876a388616a77774124fb288f5
tree9e70f81812956dbe8171f76b9f4e39ca745f5f27
parent1e61ef4ce8a5367b18a81faa28e2c2e9471c23c4
parentf56a9ad5a7c86609cf8895e8a579fb192f0ebfdb
Merge "Fix android build compatibility problems"