summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 09a5be4c: tuna: prebuilt kernel (monotonic time overflow)Todd Poynor2012-09-260-0/+0
|\ | | | | | | | | * commit 'd9829aa0512efb1868fe6ca638f70e379d18b3dc': tuna: prebuilt kernel (monotonic time overflow)
| * tuna: prebuilt kernel (monotonic time overflow)Todd Poynor2012-09-260-0/+0
| | | | | | | | | | | | | | | | | | 4ca3c11 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 b6f6b76 Merge branch 'android-3.0' into android-omap-3.0 e9babf3 timekeeping: fix 32-bit overflow in get_monotonic_boottime Bug: 7100774 Change-Id: Id50c89506682b2d06a8e00e20f57fc3ec1587f97
* | am fd63d70c: Disable scissor optimization on tuna boards Bug #7158326Romain Guy2012-09-242-0/+4
|\ \ | |/ | | | | | | * commit 'd7df0a159bb7177c6571d43749b36d26a2258b74': Disable scissor optimization on tuna boards Bug #7158326
| * Disable scissor optimization on tuna boardsRomain Guy2012-09-242-0/+4
| | | | | | | | | | | | Bug #7158326 Change-Id: I81bec7c0bd56fea5363de8546ab8606b6a508644
* | am 708e9e04: ISSUE 6849488 Bluedroid stack, remove system/bluetooth.Zhihai Xu2012-09-212-13/+0
|\ \ | |/ | | | | | | * commit 'f79109f3f9e04a71ffebdb1c311b71faef1ca9d6': ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
| * ISSUE 6849488 Bluedroid stack, remove system/bluetooth.Zhihai Xu2012-09-202-13/+0
| | | | | | | | | | | | | | | | remove system/bluetooth stuff bug 6849488 Change-Id: I183359650b84e32dc210d272d42e34d0db346ac3
* | am 16490b99: tuna: kernel prebuiltDmitry Shmidt2012-09-210-0/+0
|\ \ | |/ | | | | | | * commit '0f19d1869052958a3945e638f24f8d10b3584670': tuna: kernel prebuilt
| * tuna: kernel prebuiltDmitry Shmidt2012-09-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | 0e8dcce Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 e87dc13 Merge branch 'android-3.0' into android-omap-3.0 d6a38f4 net: wireless: bcmdhd: Adjust roaming treshold to -65 dB BUG: b/7067351 Change-Id: Id3cc684d38cb97ad4723f8d0c33d0a17d41d03e5 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | am 62532ce6: tuna: dhcp: Add CLIENTID request to dhcpcd serviceDmitry Shmidt2012-09-211-2/+2
|\ \ | |/ | | | | | | * commit 'b93b7ba06b16454bbfc1ba07b6b3fae753fa504f': tuna: dhcp: Add CLIENTID request to dhcpcd service
| * tuna: dhcp: Add CLIENTID request to dhcpcd serviceDmitry Shmidt2012-09-201-2/+2
| | | | | | | | | | | | | | BUG: b/7175187 Change-Id: I4977a4429827ab1f996d1cefb47c094fe8cafb91 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | am a33a8e11: audio: increase toro media speaker volume +2dBSimon Wilson2012-09-201-1/+1
|\ \ | |/ | | | | | | * commit '5e551279c017e57fdf66f89e10e6b81dbe301922': audio: increase toro media speaker volume +2dB
| * audio: increase toro media speaker volume +2dBSimon Wilson2012-09-181-1/+1
| | | | | | | | | | Bug: 6878923 Change-Id: Id49d6489e5a99dee088246d146ee38151ba9499c
* | am e6baffc6: tuna: kernel prebuiltDmitry Shmidt2012-09-170-0/+0
|\ \ | |/ | | | | | | * commit 'fb78ea2a618f202789bdc83d71c5d69e2c10174b': tuna: kernel prebuilt
| * tuna: kernel prebuiltDmitry Shmidt2012-09-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | 33354dd Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 5681cf2 Merge branch 'android-3.0' into android-omap-3.0 4744c26 net: wireless: bcmdhd: Add print when power-save mode is OFF 0aa3b61 net: wireless: bcmdhd: Update wifi stack ps state if was changed 477f1d9 net: wireless: bcmdhd: Add ROAM setting per platform from Makefle BUG: b/7175460, b/7067351 Change-Id: Idaf728b90502ffdfb8ce388c9337964b6620cb5b Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | am 7f410656: Merge "One more legacy symlink." into jb-mr1-devJeff Sharkey2012-09-131-4/+1
|\ \ | |/ | | | | | | * commit '61cdc30393789d83f9ba73c0f796f6d4d4eec100': One more legacy symlink.
| * Merge "One more legacy symlink." into jb-mr1-devJeff Sharkey2012-09-131-4/+1
| |\
| | * One more legacy symlink.Jeff Sharkey2012-09-131-4/+1
| | | | | | | | | | | | Change-Id: If598bb76fc760c7f12dcf9a5ff865508106e73d0
* | | am 7d69ab8b: (-s ours) am e17785c8: (-s ours) Reconcile with jb-mr0-release ↵The Android Open Source Project2012-09-120-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | - do not merge * commit 'cbba0344d9aadff44b5e7545ac3bbcdb86b445f8': tuna: Kernel prebuilt
| * | am e17785c8: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-120-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '73da42032349c22b183bb46e5d7e708d27ca983c': tuna: Kernel prebuilt
| | * \ Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-09-120-0/+0
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Ieda80a0e02948eae77ef3dc271aac8bc3111fee8
| | | * | tuna: Kernel prebuiltDmitry Shmidt2012-09-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f6d371 net: wireless: bcmdhd: Report proper mcs rate mask BUG: b/7103180 Change-Id: Icd315e735cc7ca3e6519af6a216c718280ced292 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | am 7cae4712: am 2f4ab3b1: am 5bc53d51: rename torospr to toroplusMadan Ankapura2012-09-120-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd94e677ed889ffd3de89ec02921f2010cd63fe34': rename torospr to toroplus
| * | | | am 2f4ab3b1: am 5bc53d51: rename torospr to toroplusMadan Ankapura2012-09-120-0/+0
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | * commit 'bda1a23da69be74593a08ce58100ce54965428f7': rename torospr to toroplus
| | * | am 5bc53d51: rename torospr to toroplusMadan Ankapura2012-09-120-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'fc9d6608d250b7767fcba5376da8d112cd12c006': rename torospr to toroplus
| | | * | rename torospr to toroplusMadan Ankapura2012-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6940653 Change-Id: I4cf7cc5a9f4acdc53f1d1ec13c586faf448d6645 Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
* | | | | am 260f6e0a: Include user identifier in external storage paths.Jeff Sharkey2012-09-112-29/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0d06d9429fdf9758510069d9d11ba0d9edafa7f5': Include user identifier in external storage paths.
| * | | | Include user identifier in external storage paths.Jeff Sharkey2012-09-112-29/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building external storage paths, always include user in path to enable cross-user paths and aid debugging. Bug: 7131382 Change-Id: Ic065fb8739a9d5d6e7f88ab93932391d906fed57
* | | | | am 24ad06f4: Merge "No multiuser settings for phones" into jb-mr1-devAmith Yamasani2012-09-111-2/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0fd66f5f7463e6be7a8883bcfa578f842bbee875': No multiuser settings for phones
| * | | | Merge "No multiuser settings for phones" into jb-mr1-devAmith Yamasani2012-09-111-2/+0
| |\ \ \ \
| | * | | | No multiuser settings for phonesAmith Yamasani2012-09-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I22300346f05d066db65e43cdd699f5dbc910b515
* | | | | | am c7f6720e: tuna: Update kernel prebuiltDima Zavin2012-09-110-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'de25e1b227f986781273c84e7c78f461a36a7239': tuna: Update kernel prebuilt
| * | | | | tuna: Update kernel prebuiltDima Zavin2012-09-110-0/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53f638c input: mms_ts: max x/y are max coordinates, not the x/y size Bug: 7138667 Change-Id: I8eefae22ad50657f5270c06ae0c6917bd5ccd85e Signed-off-by: Dima Zavin <dima@android.com>
* | | | | am ae2494f6: Merge "audio: add device specific audio_effects.conf file" into ↵Eric Laurent2012-09-102-2/+135
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'b2bf685a545b7492f86afe6df5df2daf9be15d7a': audio: add device specific audio_effects.conf file
| * | | | Merge "audio: add device specific audio_effects.conf file" into jb-mr1-devEric Laurent2012-09-102-2/+135
| |\ \ \ \
| | * | | | audio: add device specific audio_effects.conf fileEric Laurent2012-09-072-2/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio pre processings are not included in the default audio_effect.conf file anymore as the audio HAL has to provide support for them. Add a device specific audio_effects.conf exposing what is supported by crespo. Change-Id: I0136ebfe3e44c757b127ce9daf01f54be441badd
* | | | | | am 7b772625: am bd9be9e9: (-s ours) am adca85d2: tuna: Kernel prebuiltDmitry Shmidt2012-09-100-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'f49210d2e5c92e6034069a0e457bbf87bfe2048a': tuna: Kernel prebuilt
| * | | | | am bd9be9e9: (-s ours) am adca85d2: tuna: Kernel prebuiltDmitry Shmidt2012-09-100-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | * commit 'ae1a62cd8d4c2b5cd84ce63298c31db7f2bc2b2f': tuna: Kernel prebuilt
| | * | | am adca85d2: tuna: Kernel prebuiltDmitry Shmidt2012-09-100-0/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '19e1881fb3eeffb43f472a6b8f4f008f2d14c986': tuna: Kernel prebuilt
| | | * | tuna: Kernel prebuiltDmitry Shmidt2012-09-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f6d371 net: wireless: bcmdhd: Report proper mcs rate mask BUG: b/7103180 Change-Id: Icd315e735cc7ca3e6519af6a216c718280ced292 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | am e71d570b: audio: fix string leakage in out_get_parameters()Eric Laurent2012-09-071-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '997c66406f1d1682f3ad67973ee0fe152d11d0b8': audio: fix string leakage in out_get_parameters()
| * | | | audio: fix string leakage in out_get_parameters()Eric Laurent2012-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out_get_parameters() was calling strdup() on the string returned by str_parms_to_str() before returning it to the caller. This creates a new string which is never freed as str_parms_to_str() already allocates a new string. Change-Id: I4bcc4aa17ab55e830d7a0569151f717422f6459b
* | | | | am ebfe9d02: Merge "tuna: Kernel prebuilt" into jb-mr1-devDmitry Shmidt2012-09-070-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '43264a066c54ce58ff406dfe828a4669780adfa0': tuna: Kernel prebuilt
| * | | | Merge "tuna: Kernel prebuilt" into jb-mr1-devDmitry Shmidt2012-09-070-0/+0
| |\ \ \ \
| | * | | | tuna: Kernel prebuiltDmitry Shmidt2012-09-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95b8c1c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 ab5f2d3 Merge branch 'android-3.0' into android-omap-3.0 6a5fe81 net: wireless: bcmdhd: Report proper mcs rate mask Change-Id: I765d09d50940cef2b927359cc1bb6a8fc3f23332 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | am 7530b97d: audio: changes for new audio device enumsEric Laurent2012-09-071-69/+43
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '7ec3fa7ad22ad2d3a4e834ac5c638e4373d5b042': audio: changes for new audio device enums
| * | | | | audio: changes for new audio device enumsEric Laurent2012-09-061-69/+43
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifications for new audio device enums: - Separated input and output device fields as output and input device values are now on 32 bits. - Changed audio device API version to 2.0 Also removed get_supported_devices() function not needed if audio_policy.conf file is present. Change-Id: I41b782e7450b4664048cc484a681b9327d8395da
* | | | | am a270c5e2: Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-devJeff Sharkey2012-09-071-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '2a59ded8f1f931a5ece836ba66f9bd8836795af8': Bring back ADB_EXTERNAL_STORAGE.
| * | | | Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-devJeff Sharkey2012-09-061-0/+1
| |\ \ \ \
| | * | | | Bring back ADB_EXTERNAL_STORAGE.Jeff Sharkey2012-09-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7119408 Change-Id: Ia08146965ee6218a033a70c2f02cbc621e339316
* | | | | | am 266f0012: (-s ours) am 560e7fdf: (-s ours) Reconcile with jb-release - do ↵The Android Open Source Project2012-09-070-0/+0
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | | | | | | not merge * commit '35afd32363847884aa788a328538b2c9ab0db9ef':