OSDN Git Service

am 3097d0e1: (-s ours) am 6d24e086: Merge "Remove dead code."
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 11:17:52 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:52 +0000 (11:17 +0000)
* commit '3097d0e151b4f07552e987ee5819e9e7c6953a71':


Trivial merge