OSDN Git Service

am f36bad31: (-s ours) am 0210adda: (-s ours) am d79086a1: (-s ours) am 3acb57db...
authorStephen Hines <srhines@google.com>
Sat, 22 Feb 2014 00:40:08 +0000 (00:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 22 Feb 2014 00:40:08 +0000 (00:40 +0000)
commit92debeec74286e88ac2cd3b92d18ff2aad255834
tree8ef7f8072eedd55d7a3d330e1d7f741e034ce4f4
parent449fc26100e40d8dc9f5ca05cb111ca7f9b0d0ca
parentf36bad3128edafb52dfbc21b6d344e89f3f75fba
am f36bad31: (-s ours) am 0210adda: (-s ours) am d79086a1: (-s ours) am 3acb57db: (-s ours) am f31eb8ab: (-s ours) Merge "DO NOT MERGE - Allow global-merge option to be accessed externally."

* commit 'f36bad3128edafb52dfbc21b6d344e89f3f75fba':