OSDN Git Service

am c22b89ad: (-s ours) am c0231f26: (-s ours) am a29cfefe: (-s ours) am 95e6ae3a...
authorGeorge Mount <mount@google.com>
Thu, 27 Aug 2015 09:08:30 +0000 (09:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:08:30 +0000 (09:08 +0000)
* commit 'c22b89ad1cda0f3e02865bdbb48ee9dddee26122':


Trivial merge