• Home
  • History
  • Annotate
  • only in /external/chromium_org/sync/internal_api/public/base/
History log of /external/chromium_org/sync/internal_api/public/base/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
odel_type.h
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
ttachment_id_proto.cc
ttachment_id_proto_unittest.cc
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
EPS
ck_handle.cc
ck_handle.h
ck_handler.cc
ck_handler.h
nvalidation.cc
nvalidation.h
nvalidation_test_util.cc
nvalidation_test_util.h
nvalidation_util.cc
nvalidation_util.h
nvalidator_state.cc
nvalidator_state.h
odel_type.h
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
EPS
ck_handler.cc
ck_handler.h
ttachment_id_proto.cc
ttachment_id_proto.h
ttachment_id_proto_unittest.cc
nvalidation.cc
nvalidation.h
nvalidation_interface.cc
nvalidation_interface.h
nvalidation_util.cc
nvalidation_util.h
odel_type_test_util.cc
odel_type_test_util.h
bject_id_invalidation_map_test_util.cc
bject_id_invalidation_map_test_util.h
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
odel_type.h
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
nvalidator_state.cc
nvalidator_state.h
odel_type.h
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
nique_position.cc
nique_position.h
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
ttachment_id_proto.cc
ttachment_id_proto.h
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
odel_type.h
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
odel_type.h
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
ancelation_signal_unittest.cc
odel_type.h
odel_type_test_util.cc
odel_type_test_util.h
rdinal.h
rogress_marker_map.cc
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
nique_position_unittest.cc
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
nvalidation.cc
nvalidation.h
odel_type_test_util.cc
rdinal.h
nique_position.cc
nique_position_unittest.cc
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
EPS
nvalidation.cc
nvalidation.h
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
EPS
ck_handle.cc
ck_handle.h
nvalidation.cc
nvalidation.h
nvalidation_test_util.cc
nvalidation_test_util.h
odel_type.h
odel_type_test_util.cc
bject_id_invalidation_map_test_util.cc
bject_id_invalidation_map_test_util.h
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
ancelation_observer.cc
ancelation_observer.h
ancelation_signal.cc
ancelation_signal.h
ancelation_signal_unittest.cc
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
EPS
odel_type_invalidation_map.cc
odel_type_invalidation_map.h
odel_type_invalidation_map_test_util.cc
odel_type_invalidation_map_test_util.h
odel_type_invalidation_map_unittest.cc
odel_type_test_util.cc
odel_type_test_util.h
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
nvalidation.cc
nvalidation.h
odel_type.h
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
nique_position.cc
nique_position.h
nique_position_unittest.cc
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
nvalidation.cc
nvalidation.h
odel_type_invalidation_map.cc
odel_type_invalidation_map_unittest.cc
rogress_marker_map.cc
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
nvalidation.cc
nique_position.cc
nique_position_unittest.cc
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
odel_type.h
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
odel_type.h
odel_type_invalidation_map_unittest.cc
rdinal_unittest.cc
nique_position.cc
nique_position.h
nique_position_unittest.cc
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
EPS
nvalidation.cc
nvalidation.h
nvalidation_test_util.cc
nvalidation_test_util.h
odel_type.h
odel_type_invalidation_map.cc
odel_type_invalidation_map.h
odel_type_invalidation_map_unittest.cc
ode_ordinal.h
rogress_marker_map.h
nique_position.cc
nique_position.h
nique_position_unittest.cc
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
EPS
num_set.h
num_set_unittest.cc
nvalidation.cc
nvalidation.h
nvalidation_test_util.cc
nvalidation_test_util.h
odel_type.h
odel_type_invalidation_map.cc
odel_type_invalidation_map.h
odel_type_invalidation_map_test_util.cc
odel_type_invalidation_map_test_util.h
odel_type_invalidation_map_unittest.cc
odel_type_test_util.cc
odel_type_test_util.h
ode_ordinal.cc
ode_ordinal.h
ode_ordinal_unittest.cc
rdinal.h
rdinal_unittest.cc
rogress_marker_map.cc
rogress_marker_map.h