OSDN Git Service

am 3acb57db: (-s ours) am f31eb8ab: (-s ours) Merge "DO NOT MERGE - Allow global...
authorStephen Hines <srhines@google.com>
Tue, 27 Aug 2013 22:21:22 +0000 (15:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Aug 2013 22:21:22 +0000 (15:21 -0700)
commitd79086a173e809334532b367ee04dd9e32596f8f
tree32baffb9d24a4518cfd7c91965af1e5d6e239705
parent5d63c52424acc972d6370c50e1f3930d695790b7
parent3acb57db7bc4e1379acf668329a98acaccc2ba71
am 3acb57db: (-s ours) am f31eb8ab: (-s ours) Merge "DO NOT MERGE - Allow global-merge option to be accessed externally."

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