am a08ac9c1: (-s ours) am d64e6d7e: Merge "DO NOT MERGE: Fix undefined arg eval order...
authorPyry Haulos <phaulos@google.com>
Tue, 14 Jul 2015 18:48:31 +0000 (18:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 18:48:31 +0000 (18:48 +0000)
* commit 'a08ac9c1b0b37a965f7b5f344405d2dc4b9413e4':
  DO NOT MERGE: Fix undefined arg eval order issue in fuzzy compare


Trivial merge