am b3642259: (-s ours) am 8e77955a: Remove remaining wide line interpolation cases...
authorJarkko Pöyry <jpoyry@google.com>
Thu, 27 Aug 2015 10:45:12 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:12 +0000 (10:45 +0000)
* commit 'b3642259bb9805a16607130089ecfe71314a1679':


Trivial merge