[Merge] ~alextu/platform-api/+git/platform-api:Fixing_Android_6.x_build into ~phablet-team/platform-api/+git/platform-api:master

[Alex Tu]

Alex Tu has proposed merging ~alextu/platform-api/+git/platform-api:Fixing_Android_6.x_build into ~phablet-team/platform-api/+git/platform-api:master.

Requested reviews:
  Vicamo Yang (vicamo)
  Ubuntu Phablet Team (phablet-team)

For more details, see:
https://code.launchpad.net/~alextu/platform-api/+git/platform-api/+merge/296166

Fixing Android 6.x build error.
-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of ~alextu/platform-api/+git/platform-api:Fixing_Android_6.x_build into ~phablet-team/platform-api/+git/platform-api:master.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 2223 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20160601/71d90492/attachment.diff>