OSDN Git Service

am ddae78fb: Merge "Fix our ftw tests."
authorElliott Hughes <enh@google.com>
Tue, 10 Feb 2015 23:40:39 +0000 (23:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Feb 2015 23:40:39 +0000 (23:40 +0000)
* commit 'ddae78fba1ef7291d6a84bce11b0b8fff46f3547':
  Fix our ftw tests.


Trivial merge