Merge commit 'b249890bc6740531898d94aaecac34d5736106bc'
* commit 'b249890bc6740531898d94aaecac34d5736106bc':
Add framework support for scrolling to the "More results..." list item
Merge commit '892771ab81f79a6b0cf9735701760c5a12d6ab85'
* commit '892771ab81f79a6b0cf9735701760c5a12d6ab85':
Rename WRITE_SDCARD to WRITE_EXTERNAL_STORAGE in browser test app
Merge commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40'
* commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40':
Manually merge a few fixes from cupcake and cupcake_dcm.
Merge commit '50566b3554f440d6b84a696875147d8d21682b10'
* commit '50566b3554f440d6b84a696875147d8d21682b10':
Update reliability test code. Use a separate activity with simpler calback mechanism.
Merge commit 'fa30c0eed3386af37be0f0df7aeaa886a8e6095d'
* commit 'fa30c0eed3386af37be0f0df7aeaa886a8e6095d':
Fix a bug in AppSecurityPermissions where it wouldn't display permissions used by an app if it uses a shared user id.
* changes:
Fix a bug in AppSecurityPermissions where it wouldn't display permissions used by an app if it uses a shared user id. Remove the else clause and always get the list of requested permissions first before adding the permissions obtained via the shared user id. Also change an if condition and comments for better readability
Merge commit '10d273bb69016f7eb056d7ea1f3a929a5f5a3314'
* commit '10d273bb69016f7eb056d7ea1f3a929a5f5a3314':
Check if the ownerView is still attached to window in
Merge commit '181fafaf48208978b8ba2022683ffa78aaeddde1'
* commit '181fafaf48208978b8ba2022683ffa78aaeddde1':
Retool the backup process to use a new 'BackupAgent' class
Merge commit 'c01159bb00f7273f9b051dfbbe6bc10d54d3a846'
* commit 'c01159bb00f7273f9b051dfbbe6bc10d54d3a846':
AI 149404: Am sending again with the latest changes
Merge commit '7363e049ec7c2f490acf783a979ea101df35a055' into donut
* commit '7363e049ec7c2f490acf783a979ea101df35a055':
AI 149404: Am sending again with the latest changes
Merge commit 'afbc9ab3707cc8b1954333f258f220800b3cc104'
* commit 'afbc9ab3707cc8b1954333f258f220800b3cc104':
* Chagned RecognitionService interface to use more complex RecognitionResult instead of String.
Merge commit 'c3b7e4e7dda7a81e7f1017f17adb717ffb3d50d2'
* commit 'c3b7e4e7dda7a81e7f1017f17adb717ffb3d50d2':
Telephony support for SMS memory reporting to the network.
Merge commit 'b61ae351256518add7bcb40e0bf18337dd87195c'
* commit 'b61ae351256518add7bcb40e0bf18337dd87195c':
log the geomerty of surfaces causing an out of memory in SurfaceFlinger.
Merge commit 'a5f50b8f49cc9b34b1de462e11498d92c692b978'
* commit 'a5f50b8f49cc9b34b1de462e11498d92c692b978':
Modify the base gestures API to use streams instead of files. Adds new wrappers to easily load/save gestures from files, resources, etc. Do the same for the letters recognizer.
* changes:
Modify the base gestures API to use streams instead of files. Adds new wrappers to easily load/save gestures from files, resources, etc. Do the same for the letters recognizer.
* changes:
Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow passing a null surface. The API is now enabled to change the surface while the video is playing. This could allow orientation changes during playback or to allow the audio track from a video to play in the background. NOTE: There are still changes required to pmem driver to allow remapping shared physical memory into a process in order for this to work. This change only enables the API to send the appropriate calls when the lower level code supports it.
