OSDN Git Service

am f31eb8ab: (-s ours) Merge "DO NOT MERGE - Allow global-merge option to be accessed...
authorStephen Hines <srhines@google.com>
Tue, 27 Aug 2013 22:18:19 +0000 (15:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Aug 2013 22:18:19 +0000 (15:18 -0700)
commit3acb57db7bc4e1379acf668329a98acaccc2ba71
treec54e077b7c5648c5a317ee106dac5a46092f4536
parent5dba11700ee9f7db1b61f85f02440d2464bc2f9e
parentf31eb8ab038dabe0f70710696e0091b85f3a84e7
am f31eb8ab: (-s ours) Merge "DO NOT MERGE - Allow global-merge option to be accessed externally."

* commit 'f31eb8ab038dabe0f70710696e0091b85f3a84e7':
  DO NOT MERGE - Allow global-merge option to be accessed externally.