OSDN Git Service

am 42d669a6: (-s ours) am 92debeec: am f36bad31: (-s ours) am 0210adda: (-s ours...
authorStephen Hines <srhines@google.com>
Sat, 22 Feb 2014 00:51:48 +0000 (00:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 22 Feb 2014 00:51:48 +0000 (00:51 +0000)
commit08ab3e0efee9910819084ecb054975cffc4fc8c8
tree361a9c638bf0785a9198793b8bb744ce9f9b81cf
parentbd3e4ce9cfa61bcc0176ac17a06f0904cb854a9a
parent42d669a668c10ffff0cf40d824eeac70b39d84e9
am 42d669a6: (-s ours) am 92debeec: 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 '42d669a668c10ffff0cf40d824eeac70b39d84e9':