tree 856f90d15b1f7c74d497503bd6ac6fd12b08b32d
parent c0c5c3a1a49bb41eb1b9d7fc1f7cda0dc1007f3b
author Ethan Yonker <dees_troy@teamw.in> 1503629150 -0500
committer Ethan Yonker <dees_troy@teamw.in> 1503629150 -0500

DO NOT MERGE Android 8.0 stuff

Change-Id: I8c8a9734adbf36c33463123844fa6e078934ae34