am 9e79f899: am e068a86d: am 2d453381: (-s ours) am 2d6fd94f: Remove rest of the...
authorMika Isojärvi <misojarvi@google.com>
Thu, 27 Aug 2015 21:00:21 +0000 (21:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 21:00:21 +0000 (21:00 +0000)
* commit '9e79f8990d2f160848ae9120301132bca8cab50d':


Trivial merge