Merge commit 'a8f0f77b2e3eed77e97dd7ddd553e0dccefaf265'
* commit 'a8f0f77b2e3eed77e97dd7ddd553e0dccefaf265':
Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case.
Merge commit '6f1c854a9e70512ed9cf363eb8dd2ab2f46ea185'
* commit '6f1c854a9e70512ed9cf363eb8dd2ab2f46ea185':
Adjust the WebTextView's text size according to density.
Merge commit 'de3112227a6e7696fc41116b8461aca105e9f662'
* commit 'de3112227a6e7696fc41116b8461aca105e9f662':
Remove the FallRS demo, now promoted as a wallpaper.
Merge commit 'e180af0335b9423bd7c0d764ac3819bd4ee88d37'
* commit 'e180af0335b9423bd7c0d764ac3819bd4ee88d37':
Calculate proper output buffer size for some more 16-bit RGB color spaces.
Merge commit 'b962208d8ec529b8cc07c3bc44732603010bd691'
* commit 'b962208d8ec529b8cc07c3bc44732603010bd691':
Query for all properties if a property change is received and cache is empty.
Merge commit '0faff7b0cc06ffb933763a9494056a8ec132183a'
* commit '0faff7b0cc06ffb933763a9494056a8ec132183a':
Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash.
Merge commit 'b84214a329963be9e156f771c3c8d142280882d7'
* commit 'b84214a329963be9e156f771c3c8d142280882d7':
Do not cache POST response as Cache is indexed with url.
Merge commit 'd82bc5158c764bdd30b7d22f32258ad3c2c0c0f6' into eclair-plus-aosp
* commit 'd82bc5158c764bdd30b7d22f32258ad3c2c0c0f6':
Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case.
Merge commit 'f416264a3b13c5965bfe1c75e9fb2a480d556f87' into eclair-plus-aosp
* commit 'f416264a3b13c5965bfe1c75e9fb2a480d556f87':
Adjust the WebTextView's text size according to density.
Merge commit '1d9161e2624e3b2b7e4671dc5be8547a06d35fe8'
* commit '1d9161e2624e3b2b7e4671dc5be8547a06d35fe8':
use broadcast() instead of signal() when signaling the condition-variable Thread::RequestExitAndWait() is waiting for
Merge commit '44187ac07c73dc3ad0d3e9f9da432edffab0829d'
* commit '44187ac07c73dc3ad0d3e9f9da432edffab0829d':
fix [2037525] Fail to start camera after adb sync new Camera
Merge commit 'dfc6ca96529319613e744092d7dffeae70bf35e3'
* commit 'dfc6ca96529319613e744092d7dffeae70bf35e3':
rename Mutexes to make the code easier to follow
Merge commit 'd380586ac19903145e23ad3a8d073f01b4fe1192' into eclair-plus-aosp
* commit 'd380586ac19903145e23ad3a8d073f01b4fe1192':
Remove the FallRS demo, now promoted as a wallpaper.
Fix for http://b/issue?id=2063143 . Use TypedValue's
types to set the text size properly for the screen's
density.
Change-Id: I3772035157e2a9a8a2dba00ebddbf967c42bfa99
Make a few methods and member variables protected so behavior can be
overridden. In this case, Messaging app uses the control and doesn't
want wrap-around behavior.
Change-Id: Iceb34743b7d17e933400750a5de56b9ecfe8f146
Merge commit '201511cf8a004d386ec9f592041ad3e3d4107184' into eclair-plus-aosp
* commit '201511cf8a004d386ec9f592041ad3e3d4107184':
Calculate proper output buffer size for some more 16-bit RGB color spaces.
Merge commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c' into eclair-plus-aosp
* commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c':
Support encoding amr-wb content in stagefright.
Merge commit '71a9687e8baa9ad7ae594e6cb66a14e82d71b237'
* commit '71a9687e8baa9ad7ae594e6cb66a14e82d71b237':
Fix broken GSM SMS unit test, and general cleanup.
