HomeSort by relevance Sort by last modified time
    Searched refs:ours (Results 1 - 9 of 9) sorted by null

  /external/webkit/Tools/Scripts/
resolve-ChangeLogs 131 my ($base, $theirs, $ours) = @ARGV;
132 if (mergeChangeLogs($ours, $base, $theirs)) {
133 unlink($ours);
134 copy($theirs, $ours) or die $!;
136 exec qw(git merge-file -L THEIRS -L BASE -L OURS), $theirs, $base, $ours;
  /external/chromium/third_party/libjingle/source/talk/session/phone/
mediasessionclient.cc 267 for (AudioCodecs::const_iterator ours = audio_codecs.begin();
268 ours != audio_codecs.end(); ++ours) {
271 if (ours->Matches(*theirs)) {
272 AudioCodec negotiated(*ours);
303 for (VideoCodecs::const_iterator ours = video_codecs.begin();
304 ours != video_codecs.end(); ++ours) {
307 if (ours->Matches(*theirs)) {
308 VideoCodec negotiated(*ours);
    [all...]
  /cts/tests/SignatureTest/
Android.mk 45 # empty/non-existent resouce dirs (which ours would be). If it finds
  /external/quake/
NOTICE 59 Also, for each author's protection and ours, we want to make certain
404 Also, for each author's protection and ours, we want to make certain
    [all...]
  /external/bluetooth/bluez/gdbus/
NOTICE 65 Also, for each author's protection and ours, we want to make certain
  /external/bluetooth/bluez/input/
NOTICE 65 Also, for each author's protection and ours, we want to make certain
  /external/bluetooth/bluez/plugins/
NOTICE 65 Also, for each author's protection and ours, we want to make certain
  /external/bluetooth/bluez/src/
NOTICE 67 Also, for each author's protection and ours, we want to make certain
  /external/dnsmasq/contrib/dnslist/
dnslist.pl 311 Also, for each author's protection and ours, we want to make certain

Completed in 168 milliseconds