Searched refs:conflicts (Results 1 – 2 of 2) sorted by relevance
| /development/samples/IntentPlayground/src/com/example/android/intentplayground/ |
| D | IntentFlags.java | 63 IntentFlag(String name, Set<IntentFlag> complements, Set<IntentFlag> conflicts, in IntentFlag() argument
67 this.mConflicts = conflicts; in IntentFlag()
|
| /development/tools/repo_diff/service/repodiff/persistence/filesystem/testdata/ |
| D | commit.csv | 886 …S test case for Bug 34325986 CTS test case: testPocCVE_2017_0580 Fixing conflicts Moved the test c…
1245 …est case is testPocCVE_2017_0576 (Poc executable: CVE-2017-0576) Fixing conflicts Moved to Poc17_0…
1408 …m/cts,fake_azEGj8YKQBSfLqbiN8v8zg@fakeemail.com,"Revert ""resolve merge conflicts of 2537ffdefc to…
1492 …6f,platform/cts,fake_OfUvxYOvTMClN9kUEG5V8w@fakeemail.com,resolve merge conflicts of ac55c2b2e4 to…
1586 …4QRQM8w@fakeemail.com,Adding month to delineation so as to remove merge conflicts when adding test…
1883 …t case is testPocCVE_2016_10231 (Poc executable: CVE-2016_10231) Fixing conflicts Moved to Poc17_0…
2018 …est case is testPocCVE_2017_0564 (Poc executable: CVE-2017-0564) Fixing conflicts Removed comments…
2291 …Test case is testPocCVE_2017_0579 (PoC executable CVE-2017-0579) Fixing conflicts Fixed a missing …
2379 …m,CTS test for Bug 33452365 CTS Test case is testPocBug_33452365 Fixing conflicts Fixed '}' at the…
2692 …CTS test case for Bug 33751424 CTS test case is testPocCVE_2017_7369 Fixing conflicts Bug: 33751424
[all …]
|