tree 0a944b25bc66fbb99cc164d86d596070df634b2d
parent 4219c32097ea68bdbca962e053ad34ca308288aa
parent f9ddf987e3bd182307d7ca968d2ec0e0980b448d
author Elliott Hughes <enh@google.com> 1384906956 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1384906956 +0000

Merge "Remove an Android hack and support building with uapi headers too."