tree 4a6f967490821641ea87a23b60e939a57f5ccc8f
parent 89ff489006afe0406fa5b22a8bb704d276d3f554
parent aa1b5eae9c5281b519691d3026f38e834e57556a
author Elliott Hughes <enh@google.com> 1373307332 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1373307332 +0000

Merge "Remove hacks now we've fixed bionic."