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)
* commit 'f31eb8ab038dabe0f70710696e0091b85f3a84e7':
  DO NOT MERGE - Allow global-merge option to be accessed externally.


Trivial merge