am c6fdfb24: am b3642259: (-s ours) am 8e77955a: Remove remaining wide line interpola...
authorJarkko Pöyry <jpoyry@google.com>
Thu, 27 Aug 2015 14:46:23 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:23 +0000 (14:46 +0000)
* commit 'c6fdfb240d32b1a55293d5faaf811098aa669184':


Trivial merge