diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-11-04 12:54:53 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-11-04 12:54:53 -0800 |
| commit | 3791a7d01e17f86fd5f293fff349aebd12a05123 (patch) | |
| tree | 2e6f7d085c48656782c100285d5852df41831239 /resources-en | |
| parent | 979193a8ed98d8c4fb21acedb4f9876099587c26 (diff) | |
| parent | 3a2425a5aed1bef93dab954745ad5665265eb70b (diff) | |
| download | idea-3791a7d01e17f86fd5f293fff349aebd12a05123.tar.gz | |
Merge remote-tracking branch 'aosp/snapshot-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/dist.gant
Change-Id: I5a8e8ea4b74cec6ae1f9725c0ec7e4144a0a7d77
Diffstat (limited to 'resources-en')
| -rw-r--r-- | resources-en/src/search/searchableOptions.xml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/resources-en/src/search/searchableOptions.xml b/resources-en/src/search/searchableOptions.xml index d10479787b77..8e26b981e3cc 100644 --- a/resources-en/src/search/searchableOptions.xml +++ b/resources-en/src/search/searchableOptions.xml @@ -13009,10 +13009,9 @@ <option name="navigation" path="ActionManager" hit="Tag to Documentation Navigation" /> <option name="tag" path="ActionManager" hit="Tag to Documentation Navigation" /> <option name="to" path="ActionManager" hit="Tag to Documentation Navigation" /> - <option name="a" path="ActionManager" hit="Take a thread dump" /> - <option name="dump" path="ActionManager" hit="Take a thread dump" /> - <option name="take" path="ActionManager" hit="Take a thread dump" /> - <option name="thread" path="ActionManager" hit="Take a thread dump" /> + <option name="get" path="ActionManager" hit="Get thread dump" /> + <option name="dump" path="ActionManager" hit="Get thread dump" /> + <option name="thread" path="ActionManager" hit="Get thread dump" /> <option name="tapestry" path="ActionManager" hit="Tapestry" /> <option name="class" path="ActionManager" hit="Tapestry Class" /> <option name="tapestry" path="ActionManager" hit="Tapestry Class" /> |