OSDN Git Service

am 02102ece: (-s ours) am b919d6a9: (-s ours) am f3eb023d: (-s ours) am 50f8944c...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 14:40:45 +0000 (14:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:40:45 +0000 (14:40 +0000)
* commit '02102ece08c08cce8a4d551dd1c84837c400d56d':


Trivial merge