summaryrefslogtreecommitdiffstats
path: root/base/string16.h
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 20:05:29 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 20:05:29 +0000
commit54882d97080cefde3e830e3f1ef307a6136982d5 (patch)
tree47bfe8a7c7b7bea3e60d99f94b44c6553bd3758b /base/string16.h
parent5dd99fd679df0dbe132987f5ef78723947a04324 (diff)
downloadchromium_src-54882d97080cefde3e830e3f1ef307a6136982d5.zip
chromium_src-54882d97080cefde3e830e3f1ef307a6136982d5.tar.gz
chromium_src-54882d97080cefde3e830e3f1ef307a6136982d5.tar.bz2
Merge 108409 - [Sync] Ensure nigori node always has encryption keys.
BUG=102526 TEST=sync_unit_tests Review URL: http://codereview.chromium.org/8438015 TBR=zea@chromium.org Review URL: http://codereview.chromium.org/8417052 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108530 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/string16.h')
0 files changed, 0 insertions, 0 deletions