OSDN Git Service

am ed3236e0: (-s ours) am d2632a83: (-s ours) am 8f585128: (-s ours) am d4e00d2b...
authorGriff Hazen <griff@google.com>
Fri, 22 May 2015 20:37:53 +0000 (20:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 20:37:53 +0000 (20:37 +0000)
* commit 'ed3236e07176ba02c7549da4794f680fc468455c':


Trivial merge