OSDN Git Service

am c1efd41f: (-s ours) Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea44...
authorYusuke Sato <yusukes@google.com>
Thu, 27 Aug 2015 10:02:54 +0000 (10:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:02:54 +0000 (10:02 +0000)
* commit 'c1efd41f3f20d0594834adde4649c762773f931f':
  Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)


Trivial merge