Merge "Fix copy-paste typos in expect* functions"
authorKalle Raita <kraita@google.com>
Wed, 18 Nov 2015 20:42:47 +0000 (20:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 18 Nov 2015 20:42:47 +0000 (20:42 +0000)

Trivial merge