Merge commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded'
* commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded':
Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit 'aa507136493b24a899b270367b08a7158085c9b8'
* commit 'aa507136493b24a899b270367b08a7158085c9b8':
Check that playlist entries refer to a row in the audio table.
Merge commit '216638a0357e8f3abf452c4bd073d8ee2cdb4bb0'
* commit '216638a0357e8f3abf452c4bd073d8ee2cdb4bb0':
Add documentation about flash and change video-light to torch.
Merge commit '9da48f26028b61e3b757775f54a05293b9dca798'
* commit '9da48f26028b61e3b757775f54a05293b9dca798':
Allways dump the list of allocated buffers when an allocation fails.
Merge commit '7a5917d5db3f9d9f3145e7be9c95a2533d35308e'
* commit '7a5917d5db3f9d9f3145e7be9c95a2533d35308e':
Improve logging code to dump more detaild rs object info. Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement.
Merge commit 'd155f6d79251ecc1f27e079e9ac05d7855dda505'
* commit 'd155f6d79251ecc1f27e079e9ac05d7855dda505':
Modified the test case name for the browser page load test.
Merge commit 'dd205d14468b532395a2d9896dd550150f09cc23'
* commit 'dd205d14468b532395a2d9896dd550150f09cc23':
Don't forget to clear "backup in progress" state when finishing a pass
Merge commit '98b050d067037bd25ac81b75d46bf030c6d73b9e'
* commit '98b050d067037bd25ac81b75d46bf030c6d73b9e':
add new column "real_date" for IM messages table.
Merge commit '7df612ceb9edd01808cd74bd460a55b548df8010'
* commit '7df612ceb9edd01808cd74bd460a55b548df8010':
bug 2148061: if PduBody is zero length, treat it as an empty message.
Merge commit 'a1414d1c5bd2c91571e83fb147c17996ec170555'
* commit 'a1414d1c5bd2c91571e83fb147c17996ec170555':
Fix issue #2148939: Sholes slow to wake up in landscape mode
Merge commit '528961a61d99280e67fbb13b78b3d2538c3025d5'
* commit '528961a61d99280e67fbb13b78b3d2538c3025d5':
Handle expiration of discovery mode in system server.
Merge commit '1ff3d1f0a2ce0843971106ab47823fafabfc1055'
* commit '1ff3d1f0a2ce0843971106ab47823fafabfc1055':
When change from narrow screen to wide screen, we will
Merge commit 'c46f886b63772be33c6e6864475140606a79e126'
* commit 'c46f886b63772be33c6e6864475140606a79e126':
Only scan windows media files when those codecs are enabled.
Merge commit '6a1f43990350421e7a41255dbcbfdf0b86e9b92c'
* commit '6a1f43990350421e7a41255dbcbfdf0b86e9b92c':
Add official assets for tabs in compatibility mode
Merge commit '2d5168f650b1865812b1174ea1c37df9bfda6390'
* commit '2d5168f650b1865812b1174ea1c37df9bfda6390':
Add auto-brightness mode to the list of backed-up settings
Merge commit '5cf07feb3df89e827324e1204674c4f3629eb27e'
* commit '5cf07feb3df89e827324e1204674c4f3629eb27e':
Fix 2146581: Make tabs work for donut apps
Merge commit 'c321ab992d526cde098986d512ce4a051c486607'
* commit 'c321ab992d526cde098986d512ce4a051c486607':
Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
Merge commit 'c27d57182a5722aba51af700593852b4ab006653'
* commit 'c27d57182a5722aba51af700593852b4ab006653':
DO NOT MERGE: Cleaning up the PipedStreamTest
Merge commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf'
* commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf':
API XML changes to accompany dalvik.system deprecation.
Merge commit '434462f0c95b5f828ee9ab5e2fd86a73dd2c6fe9'
* commit '434462f0c95b5f828ee9ab5e2fd86a73dd2c6fe9':
egl: temporarily also include eglTerminate->eglInitialize hack for 8k
Merge commit '1a3c8950394b98f6f354456830208d70e87b8bb6' into eclair-plus-aosp
* commit '1a3c8950394b98f6f354456830208d70e87b8bb6':
fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
Merge commit '879664e3e2e0169aba53d88f6c30c8b15858315d' into eclair-plus-aosp
* commit '879664e3e2e0169aba53d88f6c30c8b15858315d':
Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit 'dba93b68326f139f669aefa6770d50daff032746' into eclair-plus-aosp
* commit 'dba93b68326f139f669aefa6770d50daff032746':
Check that playlist entries refer to a row in the audio table.
Merge commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62' into eclair-plus-aosp
* commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62':
Add documentation about flash and change video-light to torch.
