tree 05219604fb3cf04df4c8e7e13ef70285f618f53d
parent a8975de92f1bba7672d447819e7ddc0f08ce8275
parent 6b49c02448cf54f5bee6955cb6e42b54febf108e
author Elliott Hughes <enh@google.com> 1385088232 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385088232 -0800

am 6b49c024: am 740edfcf: Merge "Remove an outdated hack."

* commit '6b49c02448cf54f5bee6955cb6e42b54febf108e':
  Remove an outdated hack.