Jean-Baptiste Queru
dbe61dfa77
merge 83fdc69e from gingerbread - do not merge
...
Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
2011-01-14 18:33:51 -08:00
James Dong
b1f1d0ede6
Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread
2011-01-14 16:27:48 -08:00
Jaikumar Ganesh
d8bfcd6f37
am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
...
* commit 'a788a9430956dabbc1387e5cccc15f9f41639c95':
Do Not Merge: Expose insecure rfcomm Bluetooth API.
2011-01-14 16:15:29 -08:00
Jaikumar Ganesh
824bb889ff
Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
2011-01-14 16:11:41 -08:00
Dianne Hackborn
911dd2ef0b
am 7d234fab: Merge "Don\'t drop the drawable cache completely on configuration change"
...
* commit '7d234fabe61cd5f034fe4ff4484209fbf5130c4d':
Don't drop the drawable cache completely on configuration change
2011-01-14 16:11:40 -08:00
Dianne Hackborn
861e5cada8
am c3d0d860: Merge "Make the Phone options dialog use current language"
...
* commit 'c3d0d860b6f9c6b5b09ef2ae62d59139453299dd':
Make the Phone options dialog use current language
2011-01-14 16:11:35 -08:00
Dianne Hackborn
2703442bd4
am 0950a3ef: Merge "Added check to make orientation calculations more robust"
...
* commit '0950a3ef3610184858466a4dfeb1c11c3b1ed0aa':
Added check to make orientation calculations more robust
2011-01-14 16:11:24 -08:00
Dianne Hackborn
ac9de03486
am 29c99aaa: Merge "Added check to make orientation calculations more robust" into gingerbread
...
* commit '29c99aaaaed00c605fb6cd64de169fafad0e40ed':
Added check to make orientation calculations more robust
2011-01-14 15:39:41 -08:00
Dianne Hackborn
05186bbe9f
Merge "Don't drop the drawable cache completely on configuration change"
2011-01-14 15:37:56 -08:00
Dianne Hackborn
e0aa3e5dd6
Merge "Make the Phone options dialog use current language"
2011-01-14 15:36:58 -08:00
Dianne Hackborn
2e68f7e7ef
Merge "Added check to make orientation calculations more robust"
2011-01-14 15:36:52 -08:00
Dianne Hackborn
6d3c5ae222
Merge "Added check to make orientation calculations more robust" into gingerbread
2011-01-14 15:36:26 -08:00
Dianne Hackborn
d244b218be
am c058bf00: Merge "Make the Phone options dialog use current language" into gingerbread
...
* commit 'c058bf0043290f098fb487ee33e0da13f00134f2':
Make the Phone options dialog use current language
2011-01-14 15:35:52 -08:00
Dianne Hackborn
12edc159a3
Merge "Make the Phone options dialog use current language" into gingerbread
2011-01-14 15:33:44 -08:00
Kenny Root
d37b574931
am ea6bf362: Deep clone settings for system package update DO NOT MERGE
...
* commit 'ea6bf3628140283df24f2652b686d083b0d31ed9':
Deep clone settings for system package update DO NOT MERGE
2011-01-14 13:05:53 -08:00
Eric Fischer
125407d62b
am 5a40b8ef: Merge "Add date format and map center resources for new locales." into gingerbread
...
* commit '5a40b8ef81034e00f886010c71dccd62b919028b':
Add date format and map center resources for new locales.
2011-01-13 13:11:39 -08:00
Eric Fischer
e6ec66185c
Merge "Add date format and map center resources for new locales." into gingerbread
2011-01-13 13:08:18 -08:00
Jeff Hamilton
0938c360c0
am 52d3203e: Add dispatching overrides for foreground apps.
...
* commit '52d3203ef69d4babbc4dd030a15c08c0b8d1d226':
Add dispatching overrides for foreground apps.
2011-01-13 12:46:16 -08:00
Wei-Ta Chen
4f9c47d937
am 61d9ffbf: Merge "Do not merge." into gingerbread
...
* commit '61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
Do not merge.
2011-01-13 12:06:38 -08:00
Wei-Ta Chen
4877837c2d
Merge "Do not merge." into gingerbread
2011-01-13 12:02:32 -08:00
Gloria Wang
17029ddb06
am a220a297: Merge "Initial OMA DRM forward lock contribution"
...
* commit 'a220a2979937700024662be0f8fc166ca65506ed':
Initial OMA DRM forward lock contribution
2011-01-13 11:11:51 -08:00
Gloria Wang
afa4049617
Merge "Initial OMA DRM forward lock contribution"
2011-01-13 10:51:13 -08:00
Dan Morrill
90ed94cf71
am 4330b146: Adding ASL2 attribution for VisualOn.
...
* commit '4330b1464d26fa693b61d496092e10ce0419ee3d':
Adding ASL2 attribution for VisualOn.
2011-01-13 10:19:29 -08:00
Dan Morrill
960f8a68a7
Adding ASL2 attribution for VisualOn.
...
Change-Id: I870133fc366507d95741f8aa234776de58ba60a9
2011-01-13 09:24:30 -08:00
Nick Pelly
2cf27e884b
am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
...
* commit 'a29bf14e1d2857debc632ce4304a1c72dded348c':
New Intent defined for RF ON/OFF events
2011-01-12 16:33:48 -08:00
Nick Pelly
2ee9a92f6a
Merge "New Intent defined for RF ON/OFF events" into gingerbread
2011-01-12 16:28:59 -08:00
Brad Fitzpatrick
10e82906f1
am bdb7aee0: Merge "Fix for crash when setting live wallpaper."
...
* commit 'bdb7aee0a4934eb138f7caaf921f6c86f350b4b7':
Fix for crash when setting live wallpaper.
2011-01-12 15:59:44 -08:00
Brad Fitzpatrick
421951a1df
Merge "Fix for crash when setting live wallpaper."
2011-01-12 15:45:05 -08:00
Kenny Root
6ba9878cc0
am e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
...
* commit 'e8c04db71e347396e9537ead7113ba9f46706e44':
Add the {get,set}PackageObbPaths calls to API
2011-01-12 15:06:51 -08:00
Kenny Root
9c9f15acb5
Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
2011-01-12 15:03:43 -08:00
Jaikumar Ganesh
bb5239e0f8
am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
...
* commit 'c8f42fb69867f171c04013b1b1a8f7e897ae3685':
DO NOT MERGE: Remove auto connection on ACL connection.
2011-01-12 13:58:17 -08:00
Jaikumar Ganesh
d4960f4492
Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
2011-01-12 13:56:13 -08:00
Eric Laurent
2ad398bba5
am bec4abaa: Merge "Fix issue 3302649." into gingerbread
...
* commit 'bec4abaa12bf6759f354b54119c5524cf9339e7b':
Fix issue 3302649.
2011-01-12 13:52:42 -08:00
Eric Laurent
9e41414cd5
Merge "Fix issue 3302649." into gingerbread
2011-01-12 13:50:51 -08:00
Justin Ho
65c8b1a5b2
am 7b667a0c: Merge "Updated flightmode assets" into gingerbread
...
* commit '7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
Updated flightmode assets
2011-01-12 13:50:25 -08:00
Justin Ho
a7498c90b9
Merge "Updated flightmode assets" into gingerbread
2011-01-12 13:47:59 -08:00
Kenny Root
37c43e2298
am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
...
* commit '6688b6c31765242866fc276cea7fa241fc5b5e7b':
Allow updated system apps to retain priority
2011-01-12 11:59:49 -08:00
Kenny Root
c31a45058e
Merge "Allow updated system apps to retain priority" into gingerbread
2011-01-12 11:56:25 -08:00
Andreas Huber
0955e052f9
am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
...
* commit '7c6153606cc963191362494c8cb5669749e84326':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
2011-01-12 10:35:18 -08:00
Andreas Huber
ab6f2d6117
am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
...
* commit '7e2f9cc81da788006790365ff11f06551fc1bc26':
DO NOT MERGE: Fix Matroska issues
2011-01-11 16:22:33 -08:00
repo sync
4bbc09c0e3
resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
...
Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26
2011-01-11 15:26:51 -08:00
Andreas Huber
e9bef148d2
Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread
2011-01-11 13:52:12 -08:00
Kenny Root
9dddc98693
am 91c459ec: Copy user info from PackageSetting as well
...
* commit '91c459ec7dba6d56816ff5cbd92c627e0f718915':
Copy user info from PackageSetting as well
2011-01-11 12:27:42 -08:00
Chung-yih Wang
2020ead96a
am 65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread
...
* commit '65ba2c421c19fde04e6b294087a5a9c507964575':
Add auth. username in SipProfile.
2011-01-11 02:15:29 -08:00
Chung-yih Wang
63f338d83d
Merge "Add auth. username in SipProfile." into gingerbread
2011-01-11 02:08:19 -08:00
Nick Pelly
902fb854de
am ca36d863: Update API current.xml to unbreak build.
...
* commit 'ca36d863cc1684807e93f442c5ace89f08b9b5f5':
Update API current.xml to unbreak build.
2011-01-10 14:19:30 -08:00
Martijn Coenen
4f545cef06
am 25be5365: Implement canMakeReadonly().
...
* commit '25be53652167300183282d170a00a6df576523f5':
Implement canMakeReadonly().
2011-01-10 12:14:36 -08:00
James Dong
4fb9fc9e88
am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
...
* commit '13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
2011-01-10 12:09:09 -08:00
Nick Pelly
3407f042e5
am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
...
* commit '92939376199a08fa0a3b01759579a4979c2a94a2':
Remove attemptDeadServiceRecovery() from TagTechnology's.
2011-01-10 12:06:51 -08:00
Nick Pelly
f0732fbd4d
am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
...
* commit 'd64d711d457326b503981f7e55ab1448fa23ad9f':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
2011-01-10 12:06:39 -08:00