AOSPAL-ify
Merge pull request #1 from OmarEinea/master

AOSPAL-ify