Merge commit 'e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9' into eclair-plus-aosp
* commit 'e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9':
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Merge commit 'dcf99fbe7ac981c4ef3c8def65213e148281547a' into eclair-mr2-plus-aosp
* commit 'dcf99fbe7ac981c4ef3c8def65213e148281547a':
Cleanup one of the ListView sample demos.
Merge commit '4eb4ed2d19c498998bb9560c71873fa6657d0644' into eclair-mr2-plus-aosp
* commit '4eb4ed2d19c498998bb9560c71873fa6657d0644':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
Merge commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc' into eclair-mr2
* commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
The 3-part Notepad tutorial is currently only available in the zip archive
frameworks/base/docs/html/guide/tutorials/notepad/codelab/NotepadCodeLab.zip.
This CL adds the uncompressed code to the repository so that there is a
paper trail of future changes to the code.
With this CL, you can specify a package whitelist file or a package blacklist file,
but not both. You can not specify both individual packages via -p and blacklist file,
either. But you can specify both whitelist file and individual packages via -p and they
will be summed up.
Merge commit '8158980be8336c37a30a35de4e1dbbc3b0bb02d3'
* commit '8158980be8336c37a30a35de4e1dbbc3b0bb02d3':
change the way bytes are read from InputStream.
Merge commit '2bfd9db950534a45b718f8939120a05ced5346f4'
* commit '2bfd9db950534a45b718f8939120a05ced5346f4':
Added the new phone app unittest to runtest.
Merge commit '2823d675626ead99e00dcf9958fda80c766b7f5b'
* commit '2823d675626ead99e00dcf9958fda80c766b7f5b':
updating sample plugin to use new full screen interfaces.
Merge commit '1fd97693dc03fac4e189e5361a7ac7ee033caff2' into eclair-plus-aosp
* commit '1fd97693dc03fac4e189e5361a7ac7ee033caff2':
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
Merge commit '2c0f89aaf61d62ac2f28ff3e46db6ba27983c6e5' into eclair-mr2-plus-aosp
* commit '2c0f89aaf61d62ac2f28ff3e46db6ba27983c6e5':
Update SampleBrowserPlugin to show handling
Merge commit '441b80ab3795cb9f02afa7a7397dccd7c17c0cdd' into eclair-mr2-plus-aosp
* commit '441b80ab3795cb9f02afa7a7397dccd7c17c0cdd':
change the way bytes are read from InputStream.
Merge commit '863270d143ab4d496029f8417094187061e74ef2' into eclair-mr2-plus-aosp
* commit '863270d143ab4d496029f8417094187061e74ef2':
Added the new phone app unittest to runtest.
Merge commit 'e8454e7969c4bc34d6f4a98ff27ffbf8dde20e4f' into eclair-mr2-plus-aosp
* commit 'e8454e7969c4bc34d6f4a98ff27ffbf8dde20e4f':
updating sample plugin to use new full screen interfaces.
Merge commit '579c7f19ac379294822b976b73fe4037f40eba82' into eclair-mr2-plus-aosp
* commit '579c7f19ac379294822b976b73fe4037f40eba82':
Reorganize Service API demos.
Original code by Jeffrey Sharkey <jsharkey@android.com>.
Modifications:
- Remove .classpath, .project, and default.properties.
- Remove generated files (/gen).
- Create Android.mk and _index.html.
- Cleaned up whitespace and converted to match AOSP style guide.
- Renamed SimpleWiktionary to WiktionarySimple to keep both samples next to each other in the
directory listing.
- Removed the android:text attribute in the BulletPoint due to localization issues.
Merge commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc' into eclair-plus-aosp
* commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
Merge commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3' into eclair-mr2
* commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3':
change the way bytes are read from InputStream.
Merge commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3' into eclair-plus-aosp
* commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3':
change the way bytes are read from InputStream.
