OSDN Git Service

am 813b4f27: (-s ours) merge 601d39b688bcbb1789e145d1b72753206c24d374
authorEd Heyl <edheyl@google.com>
Mon, 12 May 2014 23:25:26 +0000 (23:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:25:26 +0000 (23:25 +0000)
commitaf74944bcc98dc6488db0bec78ea11f7b56b3c23
tree9cce7b722ad9cb5cb18795fa6e2f59664ec02cd4
parenta9ecffaffcaacecc305085dc204551f9202b61cd
parent813b4f27b7d414d110d0ab6f81839204c2b7d124
am 813b4f27: (-s ours) merge 601d39b688bcbb1789e145d1b72753206c24d374

* commit '813b4f27b7d414d110d0ab6f81839204c2b7d124':