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


Trivial merge