OSDN Git Service

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


Trivial merge