OSDN Git Service

am 4b591a64: (-s ours) am cc6029b8: (-s ours) am dc085ed2: (-s ours) am 5825ad23...
authorGriff Hazen <griff@google.com>
Fri, 22 May 2015 20:37:49 +0000 (20:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 20:37:49 +0000 (20:37 +0000)
* commit '4b591a64d52a1d8444f961d65b034777affbdfcb':


Trivial merge