| commit | 3acb57db7bc4e1379acf668329a98acaccc2ba71 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <[email protected]> | Tue Aug 27 15:18:19 2013 -0700 |
| committer | Android Git Automerger <[email protected]> | Tue Aug 27 15:18:19 2013 -0700 |
| tree | c54e077b7c5648c5a317ee106dac5a46092f4536 | |
| parent | 5dba11700ee9f7db1b61f85f02440d2464bc2f9e [diff] | |
| parent | f31eb8ab038dabe0f70710696e0091b85f3a84e7 [diff] |
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.