am 57fda38b: am b00d353a: am 1b179ac7: am 220337ad: am 01516433: am 9252e819: Remove...
authorJarkko Pöyry <jpoyry@google.com>
Fri, 28 Aug 2015 18:14:39 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 18:14:39 +0000 (18:14 +0000)
* commit '57fda38bfeecd70eb4ab5adf124d417259c15ab2':


Trivial merge