tree 0cbb8322b581f3089507005486f2ab5eba0dea6b
parent 7ea919c44b05daf99c045d09eb3edafb96019da7
parent 1358b6a4fb68e81058aa938e46b125350bdf0fff
author Jean-Baptiste Queru <jbq@google.com> 1296340324 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296340324 -0800

am 1358b6a4: Tweak to make merges easier

* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier