Merge commit 'aaab0b64e53db6e174236b022526a5f207b28570'
* commit 'aaab0b64e53db6e174236b022526a5f207b28570':
add -since flag to droiddoc options for 7.xml,
Merge commit 'f0cdfa9955725c99cd4df6b933e4cb732847ebd1' into eclair-plus-aosp
* commit 'f0cdfa9955725c99cd4df6b933e4cb732847ebd1':
add -since flag to droiddoc options for 7.xml,
Merge commit 'c57930aa679385b87852a9805b971a4fb91c65be'
* commit 'c57930aa679385b87852a9805b971a4fb91c65be':
Added the Protractor algorithm for calculating the minimum cosine distance between gestures
Merge commit 'e96b6838b5a7ec3b4368e2449af9fbf0a8b75f16' into eclair-mr2-plus-aosp
* commit 'e96b6838b5a7ec3b4368e2449af9fbf0a8b75f16':
Added the Protractor algorithm for calculating the minimum cosine distance between gestures
Merge commit '492604e95239c1427dd5acb9109eb8acaaafc50d' into eclair-mr2-plus-aosp
* commit '492604e95239c1427dd5acb9109eb8acaaafc50d':
Update OBEX lib setPath Flags handling logic to be compatible with spec.
From IrOBEX, 3.3.6.1, we can see below explanation for Flags bit 1:
1 Don't create directory if it does not exist, return an error instead.
The correct understanding should be: if bit 1 is set to 1, we'll not create
directory if it not exist; if bit 1 is set to 0, we'll create it if it not
exists.
If something had backed up this setting in the 'do nothing' state, a restore of
that dataset could render a device without a hard END key unusable. There's no
clear reason to want to restore this value anyway, so we no longer back it up,
nor apply it at restore time even if the dataset contains it.
Bug: 2326562
Merge commit '43ad522d49dd3f89d7e367112fab64e4d5027bf3' into eclair-mr2-plus-aosp
* commit '43ad522d49dd3f89d7e367112fab64e4d5027bf3':
Add a callback for the ConnectSink Call.
Merge commit '7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9'
* commit '7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9':
docs: small edit to live wallpaper sentence
Merge commit '50e72439648dc36205ad307a07f3050270346308'
* commit '50e72439648dc36205ad307a07f3050270346308':
Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
Merge commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7' into eclair-plus-aosp
* commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7':
docs: small edit to live wallpaper sentence
Merge commit '5ff60dff181fc4982c822ef97e14a293af66a246' into eclair-plus-aosp
* commit '5ff60dff181fc4982c822ef97e14a293af66a246':
Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
Merge commit '601112f213035851a2fa2c2281c7f56cf767b14a' into eclair-mr2-plus-aosp
* commit '601112f213035851a2fa2c2281c7f56cf767b14a':
Implement the full screen WebView plugin.