diff options
| author | Robert Ly <robertly@google.com> | 2011-05-04 13:20:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-04 13:20:11 -0700 |
| commit | 427a51ab735e2075b2a783fcf073c9db56727104 (patch) | |
| tree | 5f805d1d68fcbaa47d578f45545528424f228d51 | |
| parent | 70b276a16264ab232403f2f44f137df129408c67 (diff) | |
| parent | 232ea51c9c1af7a56e2315de863d65382c7c9a67 (diff) | |
| download | frameworks_base-427a51ab735e2075b2a783fcf073c9db56727104.zip frameworks_base-427a51ab735e2075b2a783fcf073c9db56727104.tar.gz frameworks_base-427a51ab735e2075b2a783fcf073c9db56727104.tar.bz2 | |
am 232ea51c: am 7c8be3a7: am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1
* commit '232ea51c9c1af7a56e2315de863d65382c7c9a67':
adding the usb apis to the resources browser
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | docs/html/resources/resources-data.js | 10 |
2 files changed, 12 insertions, 0 deletions
@@ -422,6 +422,8 @@ web_docs_sample_code_flags := \ resources/samples/TicTacToeLib "TicTacToeLib" \ -samplecode $(sample_dir)/TicTacToeMain \ resources/samples/TicTacToeMain "TicTacToeMain" \ + -samplecode $(sample_dir)/USB \ + resources/samples/USB "USB" \ -samplecode $(sample_dir)/WeatherListWidget \ resources/samples/WeatherListWidget "Weather List Widget" \ -samplecode $(sample_dir)/Wiktionary \ diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js index 14118bb..03a5c02 100644 --- a/docs/html/resources/resources-data.js +++ b/docs/html/resources/resources-data.js @@ -606,6 +606,16 @@ var ANDROID_RESOURCES = [ } }, { + tags: ['sample', 'new', 'newfeature'], + path: 'samples/USB/index.html', + title: { + en: 'USB' + }, + description: { + en: 'A set of samples that demonstrate how to use various features of the USB APIs.' + } + }, + { tags: ['sample', 'ui', 'widgets'], path: 'samples/Wiktionary/index.html', title: { |