Trevor Johns
682c24e228
Resolve merge conflicts of a5060ee to nyc-dev
...
This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Scott Main
bd8dbf0d48
update url for backup service key
...
bug: 8834302
Change-Id: I7bd35db2531bf03c7503cdf56f932cedacaa6771
2013-07-09 10:49:20 -07:00
Scott Main
527b762341
more search suggest tagging
...
Change-Id: I2cbed751c4b75547feb3e6dc3d4762be9bd944d3
2013-05-15 02:33:57 -07:00
Scott Main
2779da87e2
fix backup registration url
...
external bug: 54539
Change-Id: I3d4e957d8b26c7462c7228a4e4755aee88d6895c
2013-04-22 13:03:00 -07:00
Scott Main
beb0889671
docs: add backup service to gp docs
...
Change-Id: Ic87f18f791b98fc3438bc79e6ae95de86f1cc8fc
2012-12-04 14:16:45 -08:00
