Merge commit '7e343b8d39309d2c9d73cc5d1ec2434e666ae48b'
* commit '7e343b8d39309d2c9d73cc5d1ec2434e666ae48b':
fillWindow's start position must be smaller than getCount value
Merge commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c'
* commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c':
Change in media scanner to set correct date
Merge commit '75fb44b2344b900485aaf4506531010a8335b5a7'
* commit '75fb44b2344b900485aaf4506531010a8335b5a7':
Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers
Merge commit '3b335078e8a6fe3e2045ad081785f139d5991786'
* commit '3b335078e8a6fe3e2045ad081785f139d5991786':
Fix that InputDeviceReaderThread that got killed during startup
Merge commit '357f8209f3aec63fa2779da4eeab8825f80b0a41' into gingerbread-plus-aosp
* commit '357f8209f3aec63fa2779da4eeab8825f80b0a41':
Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers
Merge commit '6feaa46496bae85adbe10e84611592612f898081' into gingerbread-plus-aosp
* commit '6feaa46496bae85adbe10e84611592612f898081':
Enable passing parameters to the MediaWriter at runtime (at start() call).
Merge commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13' into gingerbread-plus-aosp
* commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13':
Track maximum amplitude and fix getMaxAmplitude()
Merge commit '256fc04394431cbd332e56747fdbfda4cb4c2e25'
* commit '256fc04394431cbd332e56747fdbfda4cb4c2e25':
fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Merge commit 'b9353372f67dcb18bccb26165758a47cfe3197de'
* commit 'b9353372f67dcb18bccb26165758a47cfe3197de':
Updated StatusBar test app for new notifications API.
Merge commit '081bc5c47d8a980e6eafa70ddafcd89981586391' into gingerbread-plus-aosp
* commit '081bc5c47d8a980e6eafa70ddafcd89981586391':
fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Make sure to not use GL_TEXTURE_EXTERNAL when it's not supported
by the GL. The error was harmless, but annoying.
Change-Id: I571a9a9b05d35da51420950a6a6e95629067efd0
Merge commit '8896783dc1d31c5274b277c364da0ffe7cc27cca' into gingerbread-plus-aosp
* commit '8896783dc1d31c5274b277c364da0ffe7cc27cca':
Updated StatusBar test app for new notifications API.
Merge commit '87160757e827e8e158d233de09d70e7128184729' into gingerbread-plus-aosp
* commit '87160757e827e8e158d233de09d70e7128184729':
Basic handling of Notifications with fullScreenIntent.
Merge commit '8ab652896394526d8793973067b228eca34201a7'
* commit '8ab652896394526d8793973067b228eca34201a7':
docs: Remove the TOS from download flow and remove TOS entirely because
Merge commit '7dacda1142379df1f1f9854c24e452acdea98436' into gingerbread-plus-aosp
* commit '7dacda1142379df1f1f9854c24e452acdea98436':
docs: Remove the TOS from download flow and remove TOS entirely because
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into gingerbread
* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
docs: Remove the TOS from download flow and remove TOS entirely because
Merge commit '0bf5cce9ee5f7db9932a8ba27e86836a9d96677c'
* commit '0bf5cce9ee5f7db9932a8ba27e86836a9d96677c':
Fix the notification vibration setting and add a test app that lets you recover from the busted
Merge commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9' into gingerbread-plus-aosp
* commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9':
Fix the notification vibration setting and add a test app that lets you recover from the busted
Merge commit 'ea8eafad4f5438ec1291d45376959a996d36e15e'
* commit 'ea8eafad4f5438ec1291d45376959a996d36e15e':
Make bad notifications crash their application.
Merge commit '2529a45339b7e02d9d2b813358bcecd144a971ea' into gingerbread-plus-aosp
* commit '2529a45339b7e02d9d2b813358bcecd144a971ea':
Make bad notifications crash their application.
Merge commit 'cac3126c6109854640266c4807e5aa8e6a87142f'
* commit 'cac3126c6109854640266c4807e5aa8e6a87142f':
Properly note the current active restore set's token
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp
* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
Properly note the current active restore set's token
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into gingerbread
* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
Properly note the current active restore set's token
