Jean-Baptiste Queru
|
a23576889d
|
resolved conflicts for merge of ee27dd35 to master
Change-Id: Ia9f4ea86b8554ff04a3aa6b9e065239ae73740e7
|
2010-12-07 13:17:37 -08:00 |
|
Jean-Baptiste Queru
|
82b2a4b94c
|
am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master
* commit '12902d687fa1bd4bff3c2dfc079c71eacb00eedd':
Strings for NI position request are moved to resources
|
2010-12-07 13:02:22 -08:00 |
|
Gilles Debunne
|
6e42d3ffe6
|
Merge "Fix for Blink in TextView."
|
2010-12-07 12:55:09 -08:00 |
|
Jean-Baptiste Queru
|
f83c5e5eee
|
resolved conflicts for merge of 78742e01 to stage-korg-master
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
|
2010-12-07 12:51:49 -08:00 |
|
Kenny Root
|
c7feebce62
|
Merge "DefaultContainerService's JNI library is required"
|
2010-12-07 12:04:58 -08:00 |
|
Daniel Sandler
|
6f14ecd361
|
Merge "More precise status bar battery icons." into gingerbread
|
2010-12-07 12:03:36 -08:00 |
|
Jean-Baptiste Queru
|
d4d1d5a02b
|
Merge "Strings for NI position request are moved to resources"
|
2010-12-07 12:01:25 -08:00 |
|
Adam Powell
|
22beb995d5
|
Merge "Fix bug 3259292 - Make FrameLayout respect margins without a gravity setting"
|
2010-12-07 11:51:28 -08:00 |
|
James Dong
|
8422e6f96b
|
Merge "Don't drop video frames but to release them."
|
2010-12-07 11:08:53 -08:00 |
|
Shimeng (Simon) Wang
|
298da47690
|
Merge "Prevent scaling beyond zoom overview scale."
|
2010-12-07 11:08:48 -08:00 |
|
Brad Fitzpatrick
|
48a5e8e4be
|
Merge "Make getSharedPreference() async, blocking on first access."
|
2010-12-07 11:02:45 -08:00 |
|
Chet Haase
|
3120919f9e
|
Merge "Change cancel/end behavior of animations to be synchronous"
|
2010-12-07 10:51:28 -08:00 |
|
Wink Saville
|
755720bf28
|
Merge "Have MobileDataStateTracker & DataConnectionTracker communicate directly."
|
2010-12-07 10:34:49 -08:00 |
|
Patrick Scott
|
200a2ab1e5
|
Merge "Add fling to scrollable layers."
|
2010-12-07 10:17:23 -08:00 |
|
Andreas Huber
|
a81688d8a8
|
Merge "API Support for both synchronous and queued commands, optionally associated metadata."
|
2010-12-07 10:12:47 -08:00 |
|
Justin Ho
|
48f034f5aa
|
Merge "Integrating updated Google Talk stat_notify icon (mdpi)"
|
2010-12-07 10:09:28 -08:00 |
|
Nick Pelly
|
ea5d340a7f
|
am 8c30a47d: am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread
* commit '8c30a47d801be50272098e60d0079ae1b4ebd22a':
Corrected MIFARE default key set
|
2010-12-07 09:40:35 -08:00 |
|
Nick Pelly
|
1218a4a2c4
|
am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread
* commit '47e6ccb65ab0088cf04809c234cdb5f747579c8c':
Corrected MIFARE default key set
|
2010-12-07 09:34:47 -08:00 |
|
Nick Pelly
|
95e4f1e8b3
|
Merge "Corrected MIFARE default key set" into gingerbread
|
2010-12-07 09:29:21 -08:00 |
|
Amith Yamasani
|
c6b9dbfa7a
|
Merge "Prevent SearchView dropdown from showing up when SearchView is hidden."
|
2010-12-07 08:49:51 -08:00 |
|
Chung-yih Wang
|
a6a0900a10
|
am c9cc9ab5: am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
* commit 'c9cc9ab590ef879877e466c0b5f5823e11bb4c47':
Fix SIP bug of different transport/port used for requests.
|
2010-12-06 23:36:23 -08:00 |
|
Dirk Dougherty
|
5038be2912
|
am 0d49a4e8: am 0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram.
* commit '0d49a4e838769252a313738e30fe78557f769a59':
Doc change: fix href to axis_globe_inverted orientation diagram.
|
2010-12-06 23:36:18 -08:00 |
|
Martijn Coenen
|
a36ab6760c
|
am 7012f1eb: am 9a9706a2: Added missing ndef technology to getTech.
* commit '7012f1eb3759a071f06cff69cf449adb4c62192b':
Added missing ndef technology to getTech.
|
2010-12-06 23:36:09 -08:00 |
|
Nick Pelly
|
c5b1e1b059
|
am 68cea273: am e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
* commit '68cea273299e59e28f9ccd87c520cc57cbf5adce':
Added NdefFormatable tag, initial class with supported methods.
|
2010-12-06 23:36:03 -08:00 |
|
satok
|
71e26786b0
|
Merge "Move IME button to right side by new desing spec"
|
2010-12-06 22:27:54 -08:00 |
|
Chung-yih Wang
|
b15b1a5a49
|
am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
* commit '5f86d7f50beba9f6327b8a04defe4e989a153d4a':
Fix SIP bug of different transport/port used for requests.
|
2010-12-06 22:10:29 -08:00 |
|
Jason Sams
|
040869fef5
|
Merge "API review cleanup."
|
2010-12-06 22:10:18 -08:00 |
|
Chung-yih Wang
|
823f079024
|
Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
|
2010-12-06 22:07:59 -08:00 |
|
Dirk Dougherty
|
06fda4c65c
|
am 0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram.
* commit '0871ee0c6f43a7201ce49a66211c1c850eabeb6b':
Doc change: fix href to axis_globe_inverted orientation diagram.
|
2010-12-06 19:44:36 -08:00 |
|
Martijn Coenen
|
6a96815d8b
|
am 9a9706a2: Added missing ndef technology to getTech.
* commit '9a9706a213637b396226afff53c69927283609a7':
Added missing ndef technology to getTech.
|
2010-12-06 18:48:02 -08:00 |
|
Romain Guy
|
829512bbca
|
Merge "Draw text decorations correctly."
|
2010-12-06 18:47:03 -08:00 |
|
Nick Pelly
|
d9e8d48bf5
|
am e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
* commit 'e58e8a715b2c9e4f2d053e0dc95e88690a54c059':
Added NdefFormatable tag, initial class with supported methods.
|
2010-12-06 18:44:13 -08:00 |
|
Nick Pelly
|
7592f8f4d8
|
Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
|
2010-12-06 18:41:36 -08:00 |
|
Mathias Agopian
|
b0c48b8993
|
am 0484a673: am daef0a04: Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread
* commit '0484a673c5839d2be9e615e52c6a45febdf1127b':
[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
|
2010-12-06 18:25:58 -08:00 |
|
Mathias Agopian
|
d6a9c7d2db
|
am daef0a04: Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread
* commit 'daef0a040de7a9825bdbcba7b2eae66195e3a95f':
[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
|
2010-12-06 18:22:57 -08:00 |
|
Mathias Agopian
|
f219856d5e
|
Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread
|
2010-12-06 18:20:09 -08:00 |
|
Romain Guy
|
a3f05bec62
|
Merge "Correctly render text when coordinates are not integers. Bug #3225632"
|
2010-12-06 18:08:46 -08:00 |
|
James Dong
|
bfc0c66994
|
Merge "Log the exception cause for better problem analysis"
|
2010-12-06 17:50:20 -08:00 |
|
Nick Pelly
|
92860d91e9
|
am ea294903: am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
* commit 'ea294903ca4c298c44b50b473b9b10ae2b77c9e3':
Remove ACTION_TAG_DISCOVERED from protected broadcast list.
|
2010-12-06 17:48:38 -08:00 |
|
Mindy Pereira
|
0fd0cee7fe
|
Merge "Make webview edges behave the same way abslistview overscroll edges do."
|
2010-12-06 17:47:11 -08:00 |
|
Nick Pelly
|
15296b5486
|
am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
* commit 'eba947a32a0233b3a2b384c580ab47bc7f27bb4d':
Remove ACTION_TAG_DISCOVERED from protected broadcast list.
|
2010-12-06 17:45:25 -08:00 |
|
Nick Pelly
|
2361dd244d
|
Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
|
2010-12-06 17:43:46 -08:00 |
|
Adam Powell
|
a6222b5306
|
Merge "Clean up button bar styles"
|
2010-12-06 17:41:47 -08:00 |
|
Dan Bornstein
|
aa2a7ce98b
|
Merge "Propagate the concept of "packed opcode" values."
|
2010-12-06 17:25:44 -08:00 |
|
Scott Main
|
249d8e5163
|
Merge "cherry pick from gingerbread: I14e59a2281fac9a437ebf52df4c846e7a1e9cc4a Do not merge: Doc change: API diff report for gingerbread."
|
2010-12-06 17:24:24 -08:00 |
|
Scott Main
|
e6b8cae7d5
|
Merge "cherry pick from gingerbread: I08a2f67d324484ed05b956c540facd69f9028563 Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform."
|
2010-12-06 17:22:48 -08:00 |
|
Robert Greenwalt
|
860de4844a
|
Merge "Make Proxy change broadcast sticky"
|
2010-12-06 16:51:32 -08:00 |
|
James Dong
|
cc212759db
|
am 23b791cd: am d57fbe88: Fixed a race condition where some recording frames may not be released
* commit '23b791cd0f725d188b84dabfd9eeab4e3775b869':
Fixed a race condition where some recording frames may not be released
|
2010-12-06 16:45:08 -08:00 |
|
Jean-Baptiste Queru
|
eb7e7e6783
|
am 465e88eb: am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout."
* commit '465e88eb008408d4e655ca7bdd9c2b3ac305e54b':
Changing connect and response timeout.
|
2010-12-06 16:44:50 -08:00 |
|
James Dong
|
02524f3b89
|
am d57fbe88: Fixed a race condition where some recording frames may not be released
* commit 'd57fbe887fabd027e644caeaa2139c863143a786':
Fixed a race condition where some recording frames may not be released
|
2010-12-06 15:36:04 -08:00 |
|