• Home
  • History
  • Annotate
  • only in /external/chromium_org/remoting/resources/
History log of /external/chromium_org/remoting/resources/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
29b820f8d84e3bc97d62552e54923c42407f2f29 12-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.59

This commit was generated by merge_to_master.py.

Change-Id: If9c0c09d8c3a3121b5e75ae9c4c446e4e4baaae6
emoting_strings_ar.xtb
emoting_strings_bg.xtb
emoting_strings_ca.xtb
emoting_strings_cs.xtb
emoting_strings_da.xtb
emoting_strings_de.xtb
emoting_strings_el.xtb
emoting_strings_en-GB.xtb
emoting_strings_es-419.xtb
emoting_strings_es.xtb
emoting_strings_et.xtb
emoting_strings_fi.xtb
emoting_strings_fil.xtb
emoting_strings_fr.xtb
emoting_strings_hi.xtb
emoting_strings_hr.xtb
emoting_strings_hu.xtb
emoting_strings_id.xtb
emoting_strings_it.xtb
emoting_strings_iw.xtb
emoting_strings_ja.xtb
emoting_strings_ko.xtb
emoting_strings_lt.xtb
emoting_strings_lv.xtb
emoting_strings_nl.xtb
emoting_strings_no.xtb
emoting_strings_pl.xtb
emoting_strings_pt-BR.xtb
emoting_strings_pt-PT.xtb
emoting_strings_ro.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_sl.xtb
emoting_strings_sr.xtb
emoting_strings_sv.xtb
emoting_strings_th.xtb
emoting_strings_tr.xtb
emoting_strings_uk.xtb
emoting_strings_vi.xtb
emoting_strings_zh-CN.xtb
emoting_strings_zh-TW.xtb
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
UILD.gn
con_fullscreen.webp
emoting_strings.grd
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
emoting_strings.grd
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
emoting_strings.grd
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
con_options.webp
emoting_strings.grd
emoting_strings_de.xtb
emoting_strings_hi.xtb
emoting_strings_id.xtb
emoting_strings_ro.xtb
emoting_strings_th.xtb
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
emoting_strings_ar.xtb
emoting_strings_bg.xtb
emoting_strings_ca.xtb
emoting_strings_cs.xtb
emoting_strings_da.xtb
emoting_strings_de.xtb
emoting_strings_el.xtb
emoting_strings_en-GB.xtb
emoting_strings_es-419.xtb
emoting_strings_es.xtb
emoting_strings_et.xtb
emoting_strings_fi.xtb
emoting_strings_fil.xtb
emoting_strings_fr.xtb
emoting_strings_hi.xtb
emoting_strings_hr.xtb
emoting_strings_hu.xtb
emoting_strings_id.xtb
emoting_strings_it.xtb
emoting_strings_iw.xtb
emoting_strings_ja.xtb
emoting_strings_ko.xtb
emoting_strings_lt.xtb
emoting_strings_lv.xtb
emoting_strings_nl.xtb
emoting_strings_no.xtb
emoting_strings_pl.xtb
emoting_strings_pt-BR.xtb
emoting_strings_pt-PT.xtb
emoting_strings_ro.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_sl.xtb
emoting_strings_sr.xtb
emoting_strings_sv.xtb
emoting_strings_th.xtb
emoting_strings_tr.xtb
emoting_strings_uk.xtb
emoting_strings_vi.xtb
emoting_strings_zh-CN.xtb
emoting_strings_zh-TW.xtb
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
emoting_strings.grd
emoting_strings_ar.xtb
emoting_strings_bg.xtb
emoting_strings_ca.xtb
emoting_strings_cs.xtb
emoting_strings_da.xtb
emoting_strings_de.xtb
emoting_strings_el.xtb
emoting_strings_en-GB.xtb
emoting_strings_es-419.xtb
emoting_strings_es.xtb
emoting_strings_et.xtb
emoting_strings_fi.xtb
emoting_strings_fil.xtb
emoting_strings_fr.xtb
emoting_strings_hi.xtb
emoting_strings_hr.xtb
emoting_strings_hu.xtb
emoting_strings_id.xtb
emoting_strings_it.xtb
emoting_strings_iw.xtb
emoting_strings_ja.xtb
emoting_strings_ko.xtb
emoting_strings_lt.xtb
emoting_strings_lv.xtb
emoting_strings_nl.xtb
emoting_strings_no.xtb
emoting_strings_pl.xtb
emoting_strings_pt-BR.xtb
emoting_strings_pt-PT.xtb
emoting_strings_ro.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_sl.xtb
emoting_strings_sr.xtb
emoting_strings_sv.xtb
emoting_strings_th.xtb
emoting_strings_tr.xtb
emoting_strings_uk.xtb
emoting_strings_vi.xtb
emoting_strings_zh-CN.xtb
emoting_strings_zh-TW.xtb
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
rag.webp
con_close.webp
con_disconnect.webp
con_maximize_restore.webp
con_minimize.webp
emoting_strings.grd
emoting_strings_ar.xtb
emoting_strings_bg.xtb
emoting_strings_ca.xtb
emoting_strings_cs.xtb
emoting_strings_da.xtb
emoting_strings_de.xtb
emoting_strings_el.xtb
emoting_strings_en-GB.xtb
emoting_strings_es-419.xtb
emoting_strings_es.xtb
emoting_strings_et.xtb
emoting_strings_fi.xtb
emoting_strings_fil.xtb
emoting_strings_fr.xtb
emoting_strings_hi.xtb
emoting_strings_hr.xtb
emoting_strings_hu.xtb
emoting_strings_id.xtb
emoting_strings_it.xtb
emoting_strings_iw.xtb
emoting_strings_ja.xtb
emoting_strings_ko.xtb
emoting_strings_lt.xtb
emoting_strings_lv.xtb
emoting_strings_nl.xtb
emoting_strings_no.xtb
emoting_strings_pl.xtb
emoting_strings_pt-BR.xtb
emoting_strings_pt-PT.xtb
emoting_strings_ro.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_sl.xtb
emoting_strings_sr.xtb
emoting_strings_sv.xtb
emoting_strings_th.xtb
emoting_strings_tr.xtb
emoting_strings_uk.xtb
emoting_strings_vi.xtb
emoting_strings_zh-CN.xtb
emoting_strings_zh-TW.xtb
0de6073388f4e2780db8536178b129cd8f6ab386 15-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
emoting_strings.grd
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
emoting_strings.grd
emoting_strings_sr.xtb
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
EADME
ndroid/drawable-hdpi/ic_action_keyboard.png
ndroid/drawable-mdpi/ic_action_keyboard.png
ndroid/drawable-xhdpi/ic_action_keyboard.png
ndroid/drawable-xxhdpi/ic_action_keyboard.png
ndroid/drawable/empty_host_list.png
ndroid/drawable/icon_host_offline.png
ndroid/drawable/list_item_disabled_selector.xml
ndroid/drawable/list_item_selector.xml
ndroid/layout/account_dropdown.xml
ndroid/layout/account_selected.xml
ndroid/layout/desktop.xml
ndroid/layout/host.xml
ndroid/layout/main.xml
ndroid/layout/pin_dialog.xml
ndroid/menu/chromoting_actionbar.xml
ndroid/menu/desktop_actionbar.xml
ndroid/menu/help_actionbar.xml
ndroid/values-land/dimens.xml
ndroid/values/colors.xml
ndroid/values/dimens.xml
ndroid/values/styles.xml
con_help.webp
emoting_strings.grd
emoting_strings_iw.xtb
emoting_strings_no.xtb
emoting_strings_th.xtb
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
emoting_strings.grd
emoting_strings_he.xtb
emoting_strings_iw.xtb
emoting_strings_nb.xtb
emoting_strings_no.xtb
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
ndroid/drawable/empty_host_list.png
hromoting.ico
hromoting128.png
hromoting128.webp
hromoting16.png
hromoting16.webp
hromoting256.webp
hromoting32.webp
hromoting48.png
hromoting48.webp
hromoting512.webp
efault_100_percent/chromoting16.png
efault_100_percent/chromoting32.png
emoting_strings_ar.xtb
emoting_strings_bg.xtb
emoting_strings_ca.xtb
emoting_strings_cs.xtb
emoting_strings_da.xtb
emoting_strings_de.xtb
emoting_strings_el.xtb
emoting_strings_en-GB.xtb
emoting_strings_es-419.xtb
emoting_strings_es.xtb
emoting_strings_et.xtb
emoting_strings_fi.xtb
emoting_strings_fil.xtb
emoting_strings_fr.xtb
emoting_strings_hi.xtb
emoting_strings_hr.xtb
emoting_strings_hu.xtb
emoting_strings_id.xtb
emoting_strings_it.xtb
emoting_strings_ja.xtb
emoting_strings_ko.xtb
emoting_strings_lt.xtb
emoting_strings_lv.xtb
emoting_strings_nl.xtb
emoting_strings_pl.xtb
emoting_strings_pt-BR.xtb
emoting_strings_pt-PT.xtb
emoting_strings_ro.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_sl.xtb
emoting_strings_sr.xtb
emoting_strings_sv.xtb
emoting_strings_th.xtb
emoting_strings_tr.xtb
emoting_strings_uk.xtb
emoting_strings_vi.xtb
emoting_strings_zh-CN.xtb
emoting_strings_zh-TW.xtb
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
emoting_strings_ar.xtb
emoting_strings_bg.xtb
emoting_strings_ca.xtb
emoting_strings_cs.xtb
emoting_strings_da.xtb
emoting_strings_de.xtb
emoting_strings_el.xtb
emoting_strings_en-GB.xtb
emoting_strings_es-419.xtb
emoting_strings_es.xtb
emoting_strings_et.xtb
emoting_strings_fi.xtb
emoting_strings_fil.xtb
emoting_strings_fr.xtb
emoting_strings_hi.xtb
emoting_strings_hr.xtb
emoting_strings_hu.xtb
emoting_strings_id.xtb
emoting_strings_it.xtb
emoting_strings_ja.xtb
emoting_strings_ko.xtb
emoting_strings_lt.xtb
emoting_strings_lv.xtb
emoting_strings_nl.xtb
emoting_strings_pl.xtb
emoting_strings_pt-BR.xtb
emoting_strings_pt-PT.xtb
emoting_strings_ro.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_sl.xtb
emoting_strings_sr.xtb
emoting_strings_sv.xtb
emoting_strings_th.xtb
emoting_strings_tr.xtb
emoting_strings_uk.xtb
emoting_strings_vi.xtb
emoting_strings_zh-CN.xtb
emoting_strings_zh-TW.xtb
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
ndroid/drawable/empty_host_list.png
ndroid/drawable/icon_host_offline.png
ndroid/drawable/list_item_disabled_selector.xml
ndroid/drawable/list_item_selector.xml
ndroid/layout/account_selected.xml
ndroid/layout/host.xml
ndroid/layout/main.xml
ndroid/values/colors.xml
ndroid/values/styles.xml
lay_store_resources.cc
emoting_strings.grd
emoting_strings_da.xtb
emoting_strings_el.xtb
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
EADME
ndroid/drawable-hdpi/ic_action_keyboard.png
ndroid/drawable-mdpi/ic_action_keyboard.png
ndroid/drawable-xhdpi/ic_action_keyboard.png
ndroid/drawable-xxhdpi/ic_action_keyboard.png
ndroid/drawable/list_item_selector.xml
ndroid/layout/account_dropdown.xml
ndroid/layout/account_selected.xml
ndroid/layout/desktop.xml
ndroid/layout/host.xml
ndroid/layout/main.xml
ndroid/layout/pin_dialog.xml
ndroid/menu/chromoting_actionbar.xml
ndroid/menu/desktop_actionbar.xml
ndroid/menu/help_actionbar.xml
ndroid/values-land/dimens.xml
ndroid/values/colors.xml
ndroid/values/dimens.xml
ndroid/values/styles.xml
ayout/desktop.xml
ayout/host.xml
ayout/main.xml
ayout/pin_dialog.xml
enu/chromoting_actionbar.xml
enu/desktop_actionbar.xml
emoting_strings.grd
trings.xml
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
ayout/desktop.xml
enu/desktop_actionbar.xml
emoting_strings.grd
emoting_strings_ar.xtb
emoting_strings_el.xtb
emoting_strings_hi.xtb
emoting_strings_hu.xtb
emoting_strings_ko.xtb
emoting_strings_nl.xtb
emoting_strings_pl.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_zh-CN.xtb
trings.xml
tyles.xml
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
emoting_strings_hi.xtb
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
emoting_strings_ar.xtb
emoting_strings_bg.xtb
emoting_strings_ca.xtb
emoting_strings_cs.xtb
emoting_strings_da.xtb
emoting_strings_de.xtb
emoting_strings_el.xtb
emoting_strings_en-GB.xtb
emoting_strings_es-419.xtb
emoting_strings_es.xtb
emoting_strings_et.xtb
emoting_strings_fi.xtb
emoting_strings_fil.xtb
emoting_strings_fr.xtb
emoting_strings_hi.xtb
emoting_strings_hr.xtb
emoting_strings_hu.xtb
emoting_strings_id.xtb
emoting_strings_it.xtb
emoting_strings_ja.xtb
emoting_strings_ko.xtb
emoting_strings_lt.xtb
emoting_strings_lv.xtb
emoting_strings_nl.xtb
emoting_strings_pl.xtb
emoting_strings_pt-BR.xtb
emoting_strings_pt-PT.xtb
emoting_strings_ro.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_sl.xtb
emoting_strings_sr.xtb
emoting_strings_sv.xtb
emoting_strings_th.xtb
emoting_strings_tr.xtb
emoting_strings_uk.xtb
emoting_strings_vi.xtb
emoting_strings_zh-CN.xtb
emoting_strings_zh-TW.xtb
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
emoting_strings.grd
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
ayout/host.xml
ayout/main.xml
ayout/pin_dialog.xml
lus.webp
eload.webp
emoting_strings.grd
emoting_strings_ar.xtb
emoting_strings_bg.xtb
emoting_strings_ca.xtb
emoting_strings_cs.xtb
emoting_strings_da.xtb
emoting_strings_de.xtb
emoting_strings_el.xtb
emoting_strings_en-GB.xtb
emoting_strings_es-419.xtb
emoting_strings_es.xtb
emoting_strings_et.xtb
emoting_strings_fi.xtb
emoting_strings_fil.xtb
emoting_strings_fr.xtb
emoting_strings_hi.xtb
emoting_strings_hr.xtb
emoting_strings_hu.xtb
emoting_strings_id.xtb
emoting_strings_it.xtb
emoting_strings_ja.xtb
emoting_strings_ko.xtb
emoting_strings_lt.xtb
emoting_strings_lv.xtb
emoting_strings_nl.xtb
emoting_strings_pl.xtb
emoting_strings_pt-BR.xtb
emoting_strings_pt-PT.xtb
emoting_strings_ro.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_sl.xtb
emoting_strings_sr.xtb
emoting_strings_sv.xtb
emoting_strings_th.xtb
emoting_strings_tr.xtb
emoting_strings_uk.xtb
emoting_strings_vi.xtb
emoting_strings_zh-CN.xtb
emoting_strings_zh-TW.xtb
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
emoting_strings.grd
c2db58bd994c04d98e4ee2cd7565b71548655fe3 14-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Ifa927da4997e49ab95edfc5def5ee5615a76b1be
con_host.png
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
enu/chromoting_actionbar.xml
trings.xml
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
ayout/pin_dialog.xml
trings.xml
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
ommon_resources.grd
enu/chromoting_actionbar.xml
enu/desktop_actionbar.xml
emoting_strings.grd
esource_ids
trings.xml
tyles.xml
fb250657ef40d7500f20882d5c9909c1013367d3 31-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214456

This commit was generated by merge_to_master.py.

Change-Id: If3f38c7966c2034e96c669968f72ea1e57f41964
ommon_resources.grd
emoting_strings.grd
esource_ids
d3868032626d59662ff73b372b5d584c1d144c53 31-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214391

This commit was generated by merge_to_master.py.

Change-Id: Iad15fada300ebc6cf9cbcebfc484b1a5f5f372e5
ommon_resources.grd
emoting_strings.grd
esource_ids
bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 25-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213605

This commit was generated by merge_to_master.py.

Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
trings.xml
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
emoting_strings.grd
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
con_host.png
ayout/host.xml
ayout/main.xml
emoting_strings_ar.xtb
emoting_strings_bg.xtb
emoting_strings_ca.xtb
emoting_strings_cs.xtb
emoting_strings_da.xtb
emoting_strings_de.xtb
emoting_strings_el.xtb
emoting_strings_en-GB.xtb
emoting_strings_es-419.xtb
emoting_strings_es.xtb
emoting_strings_et.xtb
emoting_strings_fi.xtb
emoting_strings_fil.xtb
emoting_strings_fr.xtb
emoting_strings_hi.xtb
emoting_strings_hr.xtb
emoting_strings_hu.xtb
emoting_strings_id.xtb
emoting_strings_it.xtb
emoting_strings_ja.xtb
emoting_strings_ko.xtb
emoting_strings_lt.xtb
emoting_strings_lv.xtb
emoting_strings_nl.xtb
emoting_strings_pl.xtb
emoting_strings_pt-BR.xtb
emoting_strings_pt-PT.xtb
emoting_strings_ro.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_sl.xtb
emoting_strings_sr.xtb
emoting_strings_sv.xtb
emoting_strings_th.xtb
emoting_strings_tr.xtb
emoting_strings_uk.xtb
emoting_strings_vi.xtb
emoting_strings_zh-CN.xtb
emoting_strings_zh-TW.xtb
trings.xml
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
emoting_strings.grd
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
hromoting128.png
hromoting16.png
efault_100_percent/chromoting16.png
efault_100_percent/chromoting32.png
emoting_strings.grd
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
emoting_strings.grd
emoting_strings_ar.xtb
emoting_strings_bg.xtb
emoting_strings_ca.xtb
emoting_strings_cs.xtb
emoting_strings_da.xtb
emoting_strings_de.xtb
emoting_strings_el.xtb
emoting_strings_en-GB.xtb
emoting_strings_es-419.xtb
emoting_strings_es.xtb
emoting_strings_et.xtb
emoting_strings_fi.xtb
emoting_strings_fil.xtb
emoting_strings_fr.xtb
emoting_strings_hi.xtb
emoting_strings_hr.xtb
emoting_strings_hu.xtb
emoting_strings_id.xtb
emoting_strings_it.xtb
emoting_strings_ja.xtb
emoting_strings_ko.xtb
emoting_strings_lt.xtb
emoting_strings_lv.xtb
emoting_strings_nl.xtb
emoting_strings_pl.xtb
emoting_strings_pt-BR.xtb
emoting_strings_pt-PT.xtb
emoting_strings_ro.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_sl.xtb
emoting_strings_sr.xtb
emoting_strings_sv.xtb
emoting_strings_th.xtb
emoting_strings_tr.xtb
emoting_strings_uk.xtb
emoting_strings_vi.xtb
emoting_strings_zh-CN.xtb
emoting_strings_zh-TW.xtb
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
emoting_strings.grd
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
emoting_strings.grd
emoting_strings_ar.xtb
emoting_strings_bg.xtb
emoting_strings_ca.xtb
emoting_strings_cs.xtb
emoting_strings_da.xtb
emoting_strings_de.xtb
emoting_strings_el.xtb
emoting_strings_en-GB.xtb
emoting_strings_es-419.xtb
emoting_strings_es.xtb
emoting_strings_et.xtb
emoting_strings_fi.xtb
emoting_strings_fil.xtb
emoting_strings_fr.xtb
emoting_strings_hi.xtb
emoting_strings_hr.xtb
emoting_strings_hu.xtb
emoting_strings_id.xtb
emoting_strings_it.xtb
emoting_strings_ja.xtb
emoting_strings_ko.xtb
emoting_strings_lt.xtb
emoting_strings_lv.xtb
emoting_strings_nl.xtb
emoting_strings_pl.xtb
emoting_strings_pt-BR.xtb
emoting_strings_pt-PT.xtb
emoting_strings_ro.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_sl.xtb
emoting_strings_sr.xtb
emoting_strings_sv.xtb
emoting_strings_th.xtb
emoting_strings_tr.xtb
emoting_strings_uk.xtb
emoting_strings_vi.xtb
emoting_strings_zh-CN.xtb
emoting_strings_zh-TW.xtb
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
hromoting128.png
hromoting128.webp
hromoting16.png
hromoting16.webp
hromoting256.png
hromoting256.webp
hromoting32.png
hromoting32.webp
hromoting48.png
hromoting48.webp
hromoting512.png
hromoting512.webp
efault_100_percent/chromoting16.png
isclosure_arrow_down.png
isclosure_arrow_down.webp
isclosure_arrow_right.png
isclosure_arrow_right.webp
ost_setup_instructions.png
ost_setup_instructions.webp
con_cross.png
con_cross.webp
con_host.png
con_host.webp
con_pencil.png
con_pencil.webp
con_warning.png
con_warning.webp
nfographic_my_computers.png
nfographic_my_computers.webp
nfographic_remote_assistance.png
nfographic_remote_assistance.webp
emoting_strings.grd
emoting_strings_ar.xtb
emoting_strings_bg.xtb
emoting_strings_ca.xtb
emoting_strings_cs.xtb
emoting_strings_da.xtb
emoting_strings_de.xtb
emoting_strings_el.xtb
emoting_strings_en-GB.xtb
emoting_strings_es-419.xtb
emoting_strings_es.xtb
emoting_strings_et.xtb
emoting_strings_fi.xtb
emoting_strings_fil.xtb
emoting_strings_fr.xtb
emoting_strings_he.xtb
emoting_strings_hi.xtb
emoting_strings_hr.xtb
emoting_strings_hu.xtb
emoting_strings_id.xtb
emoting_strings_it.xtb
emoting_strings_ja.xtb
emoting_strings_ko.xtb
emoting_strings_lt.xtb
emoting_strings_lv.xtb
emoting_strings_nb.xtb
emoting_strings_nl.xtb
emoting_strings_pl.xtb
emoting_strings_pt-BR.xtb
emoting_strings_pt-PT.xtb
emoting_strings_ro.xtb
emoting_strings_ru.xtb
emoting_strings_sk.xtb
emoting_strings_sl.xtb
emoting_strings_sr.xtb
emoting_strings_sv.xtb
emoting_strings_th.xtb
emoting_strings_tr.xtb
emoting_strings_uk.xtb
emoting_strings_vi.xtb
emoting_strings_zh-CN.xtb
emoting_strings_zh-TW.xtb
esource_ids
tring_resources.grd
tring_resources_ar.xtb
tring_resources_bg.xtb
tring_resources_ca.xtb
tring_resources_cs.xtb
tring_resources_da.xtb
tring_resources_de.xtb
tring_resources_el.xtb
tring_resources_en-GB.xtb
tring_resources_en_US.xtb
tring_resources_es-419.xtb
tring_resources_es.xtb
tring_resources_et.xtb
tring_resources_fi.xtb
tring_resources_fil.xtb
tring_resources_fr.xtb
tring_resources_he.xtb
tring_resources_hi.xtb
tring_resources_hr.xtb
tring_resources_hu.xtb
tring_resources_id.xtb
tring_resources_it.xtb
tring_resources_ja.xtb
tring_resources_ko.xtb
tring_resources_lt.xtb
tring_resources_lv.xtb
tring_resources_nb.xtb
tring_resources_nl.xtb
tring_resources_pl.xtb
tring_resources_pt-BR.xtb
tring_resources_pt-PT.xtb
tring_resources_ro.xtb
tring_resources_ru.xtb
tring_resources_sk.xtb
tring_resources_sl.xtb
tring_resources_sr.xtb
tring_resources_sv.xtb
tring_resources_th.xtb
tring_resources_tr.xtb
tring_resources_uk.xtb
tring_resources_vi.xtb
tring_resources_zh-CN.xtb
tring_resources_zh-TW.xtb
ick.png
ick.webp
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
hromoting.ico
hromoting128.png
hromoting16.png
hromoting256.png
hromoting32.png
hromoting48.png
hromoting512.png
ommon_resources.grd
efault_100_percent/chromoting16.png
efault_100_percent/chromoting32.png
isclosure_arrow_down.png
isclosure_arrow_right.png
ost_setup_instructions.png
con_cross.png
con_host.png
con_pencil.png
con_warning.png
nfographic_my_computers.png
nfographic_remote_assistance.png
esource_ids
tring_resources.grd
tring_resources_ar.xtb
tring_resources_bg.xtb
tring_resources_ca.xtb
tring_resources_cs.xtb
tring_resources_da.xtb
tring_resources_de.xtb
tring_resources_el.xtb
tring_resources_en-GB.xtb
tring_resources_en_US.xtb
tring_resources_es-419.xtb
tring_resources_es.xtb
tring_resources_et.xtb
tring_resources_fi.xtb
tring_resources_fil.xtb
tring_resources_fr.xtb
tring_resources_he.xtb
tring_resources_hi.xtb
tring_resources_hr.xtb
tring_resources_hu.xtb
tring_resources_id.xtb
tring_resources_it.xtb
tring_resources_ja.xtb
tring_resources_ko.xtb
tring_resources_lt.xtb
tring_resources_lv.xtb
tring_resources_nb.xtb
tring_resources_nl.xtb
tring_resources_pl.xtb
tring_resources_pt-BR.xtb
tring_resources_pt-PT.xtb
tring_resources_ro.xtb
tring_resources_ru.xtb
tring_resources_sk.xtb
tring_resources_sl.xtb
tring_resources_sr.xtb
tring_resources_sv.xtb
tring_resources_th.xtb
tring_resources_tr.xtb
tring_resources_uk.xtb
tring_resources_vi.xtb
tring_resources_zh-CN.xtb
tring_resources_zh-TW.xtb
ick.png