OSDN Git Service

am bfd717b1: am 3b47da58: am 680329f1: Follow string refactoring.
authorJeff Sharkey <jsharkey@android.com>
Thu, 11 Jun 2015 05:56:18 +0000 (05:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jun 2015 05:56:18 +0000 (05:56 +0000)
* commit 'bfd717b150301ef57e5fc10ff6eb2e954256f9d0':
  Follow string refactoring.


Trivial merge