fix

Change-Id: I44c982175525368d4e3ecc483186c4a5c20cc01a
Merge pull request #1 from duvall/android-5.0

fix