James Dong
ab375862e9
am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
...
* commit 'fc59176241f498ad4eeb4237800c2eb5edd9efcd':
Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
2011-03-16 15:11:03 -07:00
James Dong
fa064b9933
Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
2011-03-16 15:09:21 -07:00
Shimeng (Simon) Wang
acdd032f0f
am 464b690a: Pass firstLayout info to native webview when setting baseLayer.
...
* commit '464b690ada24428f3dff4102659048db7128835f':
Pass firstLayout info to native webview when setting baseLayer.
2011-03-16 14:47:32 -07:00
Michael Kolb
a440dbdd11
am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
...
* commit '6bb2020e6e9914f6df3dc7d69dbd21782267fbd4':
add comment to deprecated tag
2011-03-16 13:34:30 -07:00
Andreas Huber
db6b1d7dcf
am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
...
* commit '46956b0691b2a228237d17536fe4ad33a760c0af':
DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
2011-03-16 13:18:42 -07:00
Michael Kolb
d52a4c4ac0
Merge "add comment to deprecated tag" into honeycomb-mr1
2011-03-16 13:10:48 -07:00
Andreas Huber
ecdbccea55
Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
2011-03-16 13:06:52 -07:00
Mike Lockwood
e011307d8f
am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
...
* commit '75d62cee30557145e48d792fdce4769235daa9ce':
USB System UI: Improve message for the "no app for USB accessory" dialog.
2011-03-16 12:06:58 -07:00
Mike Lockwood
b80cf4bdf6
Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
2011-03-16 12:03:39 -07:00
Michael Kolb
464e14e801
am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
...
* commit '95fd065e3cef0bef723a2e624191b08bb00ce6f8':
deprecate getVisibleTitleHeight
2011-03-16 11:35:45 -07:00
Michael Kolb
5d05f431dd
Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
2011-03-16 11:33:13 -07:00
Eric Fischer
4459711aaf
am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'cc571e9643865edc3f25aa133c467ace46ce8e80':
Import revised translations. DO NOT MERGE
2011-03-16 10:51:56 -07:00
Eric Fischer
f5ff29ae49
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-16 10:23:02 -07:00
Mike Lockwood
4dd078cd35
am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1
...
* commit 'ff51d29a0bbf7006833ad67b1aa8a52a8a9a2514':
USB System UI: Fix string localization problems
2011-03-16 04:33:29 -07:00
Mike Lockwood
923325fe00
Merge "USB System UI: Fix string localization problems" into honeycomb-mr1
2011-03-16 04:31:15 -07:00
Eric Laurent
ed61c95282
am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
...
* commit '3913c131c61288c5b4eedb063d9eb6b6204d2a1f':
Improvement for issue 3489986: BT SCO volume
2011-03-15 23:44:43 -07:00
Romain Guy
82bf71ea7a
am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248 " into honeycomb-mr1
...
* commit '46fc25171af8bbaf4594946ce406a667ce2ec27a':
Fix performance issue in Launcher Bug #3515248
2011-03-15 23:44:30 -07:00
Justin Ho
c83eb9fcaa
am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
...
* commit '6764ecf8630af4c6260007e688cea0056ecf4ec7':
Integrating new ADB USB debugging asset Bug: #6699FF
2011-03-15 23:44:12 -07:00
Justin Ho
d7ae58202b
am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
...
* commit '141505a9769099ac38eacb62409a75ff891860a1':
Fix expander list group indicator Bug: #6699FF
2011-03-15 23:44:08 -07:00
Stephen Hines
ca92c2196b
am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
...
* commit '2d5cbc92add5065a62acdd38cd254eebb1ee2f94':
2X2 matrix needs 4 float elements.
2011-03-15 23:43:55 -07:00
Eric Fischer
e0ee4cce0b
am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'acca16004fd58c2b8c489f031281b58551551dc8':
Import revised translations. DO NOT MERGE
2011-03-15 23:29:10 -07:00
Justin Ho
4f635d4b93
am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1
...
* commit '9b183a72bcaab75897d1571d55ecbaf228ed4abd':
Updated notification asset for DND mode
2011-03-15 21:37:27 -07:00
Eric Laurent
d54d83636e
Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
2011-03-15 19:17:53 -07:00
Romain Guy
f8fc4132c1
Merge "Fix performance issue in Launcher Bug #3515248 " into honeycomb-mr1
2011-03-15 18:23:48 -07:00
Justin Ho
0d88d2b5c7
Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
2011-03-15 16:52:07 -07:00
Justin Ho
fbd578454e
Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
2011-03-15 16:47:27 -07:00
Stephen Hines
f38ea534a7
Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
2011-03-15 16:22:19 -07:00
Eric Fischer
d97acec4b8
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-15 14:59:33 -07:00
Justin Ho
26d44cbae3
Merge "Updated notification asset for DND mode" into honeycomb-mr1
2011-03-15 14:41:30 -07:00
Kenny Root
98755be6ed
am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
...
* commit '7ddd62b5bedf9065bba00e25aa62f2eae14cf92e':
Add byte limit in addition to ratio for installs DO NOT MERGE
2011-03-15 14:03:50 -07:00
Kenny Root
85f811bd47
Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
2011-03-15 14:01:39 -07:00
Glenn Kasten
a7813f03a1
am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
...
* commit '4528a7db389b4da73207d00ca15b306a111650cc':
Bug 4016329 do full string comparisons
2011-03-15 13:46:27 -07:00
Glenn Kasten
ad4c66d8bb
Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
2011-03-15 13:44:58 -07:00
Mike Lockwood
5938ddb594
am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1
...
* commit '3b7871c242bea5834c657c25fbb89c382566f66f':
USB Manager string clean up:
2011-03-15 13:42:44 -07:00
Svetoslav Ganov
84387c915a
am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
...
* commit 'bdabdda8954a70625368fbfe6bb283a9200bf2f8':
CheckBoxPreferences do not fire accessibility events
2011-03-15 13:42:38 -07:00
Mike Lockwood
9169158b3d
am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1
...
* commit 'afd1c0143dfa63bd133e3a4163cc9cc4216e3514':
SqliteDatabase: Fix local reference leak in custom_function_callback()
2011-03-15 13:42:35 -07:00
Mike Lockwood
a2863eba79
Merge "USB Manager string clean up:" into honeycomb-mr1
2011-03-15 13:34:06 -07:00
Svetoslav Ganov
3bec96dff1
Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
2011-03-15 13:23:17 -07:00
Mike Lockwood
b98c4305b5
Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1
2011-03-15 13:20:58 -07:00
Adam Powell
332cedc23d
am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have a fading edge" into honeycomb-mr1
...
* commit '1d233d9708e39f5b57b231746df658567b153484':
Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge
2011-03-15 12:51:07 -07:00
Stephen Hines
8e5bf2db18
am c2db0d40: Merge "Make RS Matrix functions threadable." into honeycomb-mr1
...
* commit 'c2db0d405b7d4b7654dbd3740cc065802e4c294e':
Make RS Matrix functions threadable.
2011-03-15 12:50:57 -07:00
Jamie Gennis
0ce8f1b853
am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1
...
* commit '00f47af85a98c6dc3b20d04d8ee6b9a327175ab6':
SurfaceTexture: disallow unsupported uses.
2011-03-15 12:50:55 -07:00
Romain Guy
57e73fdb0f
am a1bd5a5f: Merge "Fix disappearing edges in lists/scrollviews/etc. Bug #4093871 " into honeycomb-mr1
...
* commit 'a1bd5a5fd7107483290627d942ae2dd1910b57ca':
Fix disappearing edges in lists/scrollviews/etc. Bug #4093871
2011-03-15 12:50:50 -07:00
Scott Main
c8d0934059
am 197d7752: am e8f95e7f: docs: update device dashboard
...
* commit '197d77528648b7ec3d44ca6ab63e3036669c1bc8':
docs: update device dashboard
2011-03-15 12:50:47 -07:00
Amith Yamasani
5da4943df8
am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1
...
* commit '7e978441eeed9defb1031cc17c2857cf06cf825a':
Use more padding on the sides for SearchView
2011-03-15 12:50:35 -07:00
Adam Powell
c31fd2fdb9
Merge "Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge" into honeycomb-mr1
2011-03-15 12:06:45 -07:00
Xavier Ducrohet
7d449d205c
am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge.
...
* commit 'b7b877a45f469336703844a928482e6438442567':
Merge 9d76581f from honeycomb. do not merge.
2011-03-15 12:05:46 -07:00
Xavier Ducrohet
3c10c7f022
am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge.
...
* commit 'a82a219a7aaee82d790810f6660924604b7a7e81':
Merge adaa12cd from honeycomb. do not merge.
2011-03-15 12:05:43 -07:00
Brad Fitzpatrick
ef098e3f2c
am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown."
...
* commit '403da3a79af78920b33448bbc8d91c4b8aebf4a4':
Releasing lock even if exception is thrown.
2011-03-15 12:05:40 -07:00
Brad Fitzpatrick
caa8c8088c
am a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
...
* commit 'a74887e87c720fd100f10b2e69a027c493036e20':
Lazy initialization must be synchronized to avoid parallel instances cretation.
2011-03-15 12:05:37 -07:00