oppsies.. (no merge)...

Change-Id: Ia7f51fcd209bea25c1fbef1f4c826fe74932601b
Merge branch 'du44' of https://github.com/kittleapps/frameworks_base into du44