am a306a602: am f1044096: am 79c79d54: Merge "Remove broken line interpolation tests...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 4 May 2015 17:18:28 +0000 (17:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 May 2015 17:18:28 +0000 (17:18 +0000)
* commit 'a306a602a0610258708a60a22b05d7bd85a841c8':


Trivial merge