Xavier Ducrohet
1b090b7b22
am 62461d12: Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb
...
* commit '62461d128fcb1314d96661e77f9744e5e50f57e3':
LayoutLib: put a default image on the quickcontactbadge.
2011-01-26 21:15:22 -08:00
Jim Miller
01f8cb8dce
am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb
...
* commit '57d472a5b1f69e3aa0159f41c7ef625d4418c27f':
Fix 3381324: Restart ripples when the user moves away from the edge.
2011-01-26 21:15:17 -08:00
Justin Ho
6202fc3289
am 597e644d: Merge "Integrating xlarge mdpi battery charging assets" into honeycomb
...
* commit '597e644d7a445e6f5555f3f51b6ed78b1e6c1243':
Integrating xlarge mdpi battery charging assets
2011-01-26 21:15:10 -08:00
Michael Kolb
d997a34f33
am 85fd2c91: Merge "fix incognito url loading" into honeycomb
...
* commit '85fd2c9102f7cf105bf498f05ca35360a4bcede5':
fix incognito url loading
2011-01-26 21:15:01 -08:00
Xavier Ducrohet
196a360071
Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb
2011-01-26 19:54:46 -08:00
Jim Miller
eb1b0edd61
Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb
2011-01-26 19:39:23 -08:00
Justin Ho
be6c48f741
Merge "Integrating xlarge mdpi battery charging assets" into honeycomb
2011-01-26 19:34:50 -08:00
Michael Kolb
885bf8a181
Merge "fix incognito url loading" into honeycomb
2011-01-26 19:21:49 -08:00
Dianne Hackborn
9091b66726
am 2dc9c784: Merge "Fix issue #3382992 : IME close animation stutters from URL bar" into honeycomb
...
* commit '2dc9c784b2fab67a8233318f559e65f444bf0c97':
Fix issue #3382992 : IME close animation stutters from URL bar
2011-01-26 19:08:20 -08:00
Dianne Hackborn
2216fe00b1
Merge "Fix issue #3382992 : IME close animation stutters from URL bar" into honeycomb
2011-01-26 19:04:15 -08:00
Scott Main
b4e62fdab5
Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-26 18:48:22 -08:00
Romain Guy
0cc087096f
am ede54ce2: Merge "Fix crash in movie studio." into honeycomb
...
* commit 'ede54ce2fe3252d4ab56b90de464b35a6920970d':
Fix crash in movie studio.
2011-01-26 18:47:59 -08:00
Scott Main
0d308338e8
resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp
...
Change-Id: Ib40af8301e19b70c86161fc0a6cc061b118863ab
2011-01-26 18:47:13 -08:00
Romain Guy
1cbd3b6224
Merge "Fix crash in movie studio." into honeycomb
2011-01-26 18:46:29 -08:00
Scott Main
70b372b82c
am ba3dd323: enable preview mode for docs and add api level 10 flag for api level diffs
...
* commit 'ba3dd32357b47ab0b55a1976bbafc225df78a59d':
enable preview mode for docs and add api level 10 flag for api level diffs
2011-01-26 18:37:22 -08:00
Romain Guy
573241da75
am 9c8307fb: Merge "Make sure that we update SurfaceView\'s window with display lists. Bug #3395487 " into honeycomb
...
* commit '9c8307fb19558ffe2e897bad009fb038bb9e845b':
Make sure that we update SurfaceView's window with display lists. Bug #3395487
2011-01-26 18:32:54 -08:00
Romain Guy
9448a44f94
Merge "Make sure that we update SurfaceView's window with display lists. Bug #3395487 " into honeycomb
2011-01-26 18:29:38 -08:00
Daniel Sandler
f0e557ea49
am da597b5c: Merge "Status bar visual tweaks." into honeycomb
...
* commit 'da597b5c1a6553a43f1e938ef87b29c8f2a59386':
Status bar visual tweaks.
2011-01-26 18:19:19 -08:00
Daniel Sandler
1454366906
Merge "Status bar visual tweaks." into honeycomb
2011-01-26 18:17:49 -08:00
Gilles Debunne
b0aab24612
am bc3f7937: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
...
* commit 'bc3f79371bb93e075bcb91d92180487337afce17':
Tabs are resized to make sure they fit in their parent.
2011-01-26 18:10:58 -08:00
Gilles Debunne
fc5caaa981
Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
2011-01-26 18:09:23 -08:00
Jaikumar Ganesh
6efcffac38
am 55271a79: Merge "Disable PBAP for no voice capability" into honeycomb
...
* commit '55271a79d1c14e2952d550995569135a23971672':
Disable PBAP for no voice capability
2011-01-26 18:03:40 -08:00
Shih-wei Liao
ebf617c691
am b9d69d59: Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)" into honeycomb
...
* commit 'b9d69d595fa17ae87b4e615c2339df64a5df8324':
For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)
2011-01-26 18:03:31 -08:00
Dianne Hackborn
4311a6fff3
am 14cd455d: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '14cd455dd57f2708b63f88aab24ba6c75d13d96f':
Import revised translations. DO NOT MERGE
2011-01-26 18:03:18 -08:00
Scott Main
2982fb63a7
am bedd2427: am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
...
* commit 'bedd242768f7594d12bde0b4c4e7d153c27858d4':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
2011-01-26 17:58:54 -08:00
Scott Main
b219a84d85
am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
...
* commit 'a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
2011-01-26 17:56:26 -08:00
Jaikumar Ganesh
70f8e33a69
Merge "Disable PBAP for no voice capability" into honeycomb
2011-01-26 17:52:50 -08:00
Scott Main
e0f78c41aa
Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
2011-01-26 17:52:08 -08:00
Shih-wei Liao
a3ac0ecd8f
Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)" into honeycomb
2011-01-26 17:43:13 -08:00
Dianne Hackborn
2ae04628fb
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-26 17:38:57 -08:00
Wink Saville
03fa9e7f16
am 13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb
...
* commit '13a8f2a59c063b988502de9b7197d83b5db487d9':
Comment out the isAvailable optimization.
2011-01-26 17:32:10 -08:00
Wink Saville
6ee6d12431
Merge "Comment out the isAvailable optimization." into honeycomb
2011-01-26 17:29:32 -08:00
Scott Main
e1dcef32b6
am 0f2e2b8b: Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it\'s not a good location and the info is avilable in the dev guide, but also added some of the info to the R
...
* commit '0f2e2b8b82c7b589bcc603ce57f8ff3d1c947784':
Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description.
2011-01-26 17:09:21 -08:00
Scott Main
d0f7218893
Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description." into honeycomb
2011-01-26 17:06:45 -08:00
Andreas Huber
f8caece8b2
am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
...
* commit '586096a9575a52ea7fa318f6f8540b47ba2ed2e8':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 16:58:04 -08:00
Jeff Brown
c8e7dbb32e
am 91f2dbb7: (-s ours) am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
...
* commit '91f2dbb7825af8fbef1ce5db1f42d3171d7487ce':
Move keymaps from sdk/emulator/keymaps.
2011-01-26 16:57:38 -08:00
Xavier Ducrohet
2e02ba6e7e
am ee37ab8d: Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb
...
* commit 'ee37ab8dce5fe60d9a2af411ae9e38e3e44589ed':
LayoutLib: properly erase the bitmap when rendering a new session.
2011-01-26 16:54:31 -08:00
Xavier Ducrohet
542a223460
Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb
2011-01-26 16:52:49 -08:00
Andreas Huber
ee835990df
am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
...
* commit '2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 16:40:04 -08:00
Dianne Hackborn
c4bc510ad7
am 93257271: Merge "Remove xlarge specific icon size" into honeycomb
...
* commit '93257271add728749a181e0580f2e71f3c4f129c':
Remove xlarge specific icon size
2011-01-26 16:30:54 -08:00
Dianne Hackborn
23e9cc6feb
am 8c0ac870: Merge "Fix another part of #3387855 : Menu flashes on left side of screen" into honeycomb
...
* commit '8c0ac8708761872082c75aedc5fa4b25d1286fd0':
Fix another part of #3387855 : Menu flashes on left side of screen
2011-01-26 16:30:49 -08:00
Dianne Hackborn
e465ead390
Merge "Remove xlarge specific icon size" into honeycomb
2011-01-26 16:28:46 -08:00
Dianne Hackborn
a7ff5336ed
am 2d63144e: Merge "Fix issue #3380072 : Switching in and out of gmail not preserving position in label" into honeycomb
...
* commit '2d63144ed94dff0832d051ec355f56649244dd4e':
Fix issue #3380072 : Switching in and out of gmail not preserving position in label
2011-01-26 16:28:38 -08:00
Dianne Hackborn
9c69a1de3b
Merge "Fix another part of #3387855 : Menu flashes on left side of screen" into honeycomb
2011-01-26 16:27:40 -08:00
Mike Lockwood
9dc98635c3
am 278a04eb: Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb
...
* commit '278a04eb7a56459c2f9e3b47dcced6522a87f1d1':
Fix javadoc for MediaStore.Files.FileColumns constants
2011-01-26 16:26:26 -08:00
Dianne Hackborn
2db51d21d6
Merge "Fix issue #3380072 : Switching in and out of gmail not preserving position in label" into honeycomb
2011-01-26 16:25:49 -08:00
Mike Lockwood
501971dc5d
Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb
2011-01-26 16:24:19 -08:00
Winson Chung
239e90a16b
am b90a91c6: Making requested indices the last to be pruned when we hit cache memory limits. (3368863)
...
* commit 'b90a91c633e99d4559095184af27d1416541d3c0':
Making requested indices the last to be pruned when we hit cache memory limits. (3368863)
2011-01-26 16:14:03 -08:00
Andreas Huber
cf2258b576
am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
...
* commit '63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73':
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-26 15:52:48 -08:00
Jim Miller
a05ef9f47e
am 85433c76: Merge "Fix 3354590: Add back button to dismiss RecentAppsPanel" into honeycomb
...
* commit '85433c76066843d20c92c90d64e842e4f14dbac8':
Fix 3354590: Add back button to dismiss RecentAppsPanel
2011-01-26 15:50:41 -08:00