Merge commit '799f2bb04102b4b692b52eed5c36aea9a8cde471' into gingerbread-plus-aosp
* commit '799f2bb04102b4b692b52eed5c36aea9a8cde471':
COMMENT ONLY change to fix some formatting glitches and
Merge commit 'b37bca9e79489a1abd848ce762bb7d87203b3414' into gingerbread
* commit 'b37bca9e79489a1abd848ce762bb7d87203b3414':
COMMENT ONLY change to fix some formatting glitches and
Merge commit 'ad98d383a04fce08a147b200e23b12f12b2681a3' into gingerbread-plus-aosp
* commit 'ad98d383a04fce08a147b200e23b12f12b2681a3':
Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
Merge commit '3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8' into gingerbread-plus-aosp
* commit '3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8':
Adding a way for Hierarchy Viewer to get the focused window.
Merge commit 'db86c59e6280cb2ebeeda09ba8dee4a1440dea1d' into gingerbread-plus-aosp
* commit 'db86c59e6280cb2ebeeda09ba8dee4a1440dea1d':
New drawables for the update to the maps API (DO NOT MERGE)
Merge commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625' into gingerbread-plus-aosp
* commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625':
Make downloads visible by default.
The LHS was ignored when using:
String8 + String8
String8 + (const char*)
Add unit tests for above.
Bug: 2898473
Change-Id: Ic8fe7be668b665c36aaaa3fc3c3ffdfff0fbba25
Merge commit '5723dfe8c87d0887b8926f43637ed300466890d2' into gingerbread-plus-aosp
* commit '5723dfe8c87d0887b8926f43637ed300466890d2':
GPS: Don't set XTRA download pending flag at boot time.
Merge commit '7324489f18ee01586931f577f00567092cbf52df' into gingerbread-plus-aosp
* commit '7324489f18ee01586931f577f00567092cbf52df':
Add SIP service into system server.
Merge commit '740aa4b2865a20700254314158bcb685514b2ac2' into gingerbread-plus-aosp
* commit '740aa4b2865a20700254314158bcb685514b2ac2':
DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
Merge commit '9093717985095913934c079abfa879049bd33ba5' into gingerbread
* commit '9093717985095913934c079abfa879049bd33ba5':
DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
Merge commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803' into gingerbread-plus-aosp
* commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803':
Changed SyncOperation.toKey() to not rely on the implementation of
Merge commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39' into gingerbread
* commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39':
Changed SyncOperation.toKey() to not rely on the implementation of
Merge commit '1441bdfc19d6998607adf1347ed8dafc102908c9' into gingerbread-plus-aosp
* commit '1441bdfc19d6998607adf1347ed8dafc102908c9':
Use the target color format from the camera source if possible
Merge commit '3aad8c38520956708e51882f3fad63a7a217e8e4' into gingerbread-plus-aosp
* commit '3aad8c38520956708e51882f3fad63a7a217e8e4':
Fix an issue where the track duration does not include the last sample duration
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp
* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
Tracking merge of dalvik-dev to gingerbread
Merge commit '2c37f3d3a09188f3dc66e177547709e4828918be' into gingerbread-plus-aosp
* commit '2c37f3d3a09188f3dc66e177547709e4828918be':
Better support for fake timestamps in RTP, H.263 video now also requests FIR.
Merge commit '407ec58c6604da3255b04aa99577515deba3a26f' into gingerbread-plus-aosp
* commit '407ec58c6604da3255b04aa99577515deba3a26f':
A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
Merge commit 'fb861523318710b95c08110b9b2de28f7da74a40' into gingerbread-plus-aosp
* commit 'fb861523318710b95c08110b9b2de28f7da74a40':
Specification of codec specific data as part of the session description is now optional.