am 806a9cd3: am be43443e: am 7d804783: (-s ours) am 7d8984f7: Remove fragment_out...
authorKalle Raita <kraita@google.com>
Thu, 27 Aug 2015 21:00:22 +0000 (21:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 21:00:22 +0000 (21:00 +0000)
* commit '806a9cd39d622a29666fdb96c92b779625018c7c':


Trivial merge