OSDN Git Service
Nick Pelly [Wed, 19 Jan 2011 00:16:36 +0000 (16:16 -0800)]
am
e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
* commit '
e4dd154c08b04090bad8f450450e13163d5fef9b':
hange the default IsoDep timeout to 300ms (docs update).
Mathias Agopian [Wed, 19 Jan 2011 00:14:13 +0000 (16:14 -0800)]
am
12d014fd: Merge "fix [
3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
* commit '
12d014fdf40f69512e59e84914b230a2d3e7b8eb':
fix [
3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
Nick Pelly [Wed, 19 Jan 2011 00:11:14 +0000 (16:11 -0800)]
Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
Mathias Agopian [Wed, 19 Jan 2011 00:10:08 +0000 (16:10 -0800)]
Merge "fix [
3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
Amith Yamasani [Tue, 18 Jan 2011 23:43:44 +0000 (15:43 -0800)]
am
68153821: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
* commit '
68153821481f748ecbd2493bfd417005686960e0':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true.
Amith Yamasani [Tue, 18 Jan 2011 23:41:26 +0000 (15:41 -0800)]
Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
Irfan Sheriff [Tue, 18 Jan 2011 22:43:04 +0000 (14:43 -0800)]
am
4170b463: Merge "Do not add unsolicited events to queue" into gingerbread
* commit '
4170b46329ed91e81cf22dba82e2dadc326b3e3d':
Do not add unsolicited events to queue
Irfan Sheriff [Tue, 18 Jan 2011 22:40:18 +0000 (14:40 -0800)]
Merge "Do not add unsolicited events to queue" into gingerbread
Jeff Brown [Tue, 18 Jan 2011 22:38:27 +0000 (14:38 -0800)]
am
41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
* commit '
41395459e676cf9ab4059e08446656f145662c2d':
Filter virtual keys after touches. (DO NOT MERGE)
Jeff Brown [Tue, 18 Jan 2011 22:31:31 +0000 (14:31 -0800)]
Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
Brad Fitzpatrick [Tue, 18 Jan 2011 21:39:07 +0000 (13:39 -0800)]
am
069e810c: Merge "Fixing memory leak in PreferenceScreen."
* commit '
069e810c6a5efc0b33fbe8c29a2d11f7c342a4d8':
Fixing memory leak in PreferenceScreen.
Brad Fitzpatrick [Tue, 18 Jan 2011 21:23:13 +0000 (13:23 -0800)]
Merge "Fixing memory leak in PreferenceScreen."
Brad Fitzpatrick [Tue, 18 Jan 2011 21:20:06 +0000 (13:20 -0800)]
am
ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"
* commit '
ded2b00643c788a96ce8adc1a4cc0f7619a4c606':
frameworks/base: remove redundant code in WindowManager
Brad Fitzpatrick [Tue, 18 Jan 2011 20:59:19 +0000 (12:59 -0800)]
Merge "frameworks/base: remove redundant code in WindowManager"
Martijn Coenen [Tue, 18 Jan 2011 19:40:51 +0000 (11:40 -0800)]
am
07e6f616: Check NDEF before calling makeReadOnly().
* commit '
07e6f616d122496342a5bae51323bb218d88f7f2':
Check NDEF before calling makeReadOnly().
Martijn Coenen [Tue, 18 Jan 2011 19:38:28 +0000 (11:38 -0800)]
am
a701cf85: Implement IsoDep timeout handling (API).
* commit '
a701cf85a0167a6bb623343388a7dca6f2b61ac5':
Implement IsoDep timeout handling (API).
Mathias Agopian [Tue, 18 Jan 2011 19:26:51 +0000 (11:26 -0800)]
am
72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
* commit '
72abf01a8b6958ac1f86d36302a8462c4f51fd9d':
Fix the ISurfaceComposer onTransact switch.
Jeff Hamilton [Tue, 18 Jan 2011 19:26:39 +0000 (11:26 -0800)]
am
0716ea14: Merge "Javadoc updates for NFC." into gingerbread
* commit '
0716ea144d94b9dfce4670e90a849db19a492da9':
Javadoc updates for NFC.
Jeff Hamilton [Tue, 18 Jan 2011 19:26:22 +0000 (11:26 -0800)]
am
3a223404: Merge "New APIs for NDEF Push Protocol." into gingerbread
* commit '
3a223404e7589831a901cb16c5ce97685bc1f3f8':
New APIs for NDEF Push Protocol.
Mathias Agopian [Tue, 18 Jan 2011 19:20:04 +0000 (11:20 -0800)]
Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
Jeff Hamilton [Tue, 18 Jan 2011 19:01:55 +0000 (11:01 -0800)]
Merge "Javadoc updates for NFC." into gingerbread
Jeff Hamilton [Tue, 18 Jan 2011 19:01:05 +0000 (11:01 -0800)]
Merge "New APIs for NDEF Push Protocol." into gingerbread
Kenny Root [Mon, 17 Jan 2011 21:05:24 +0000 (13:05 -0800)]
am
524133cc: Remove API that snuck into MockPackageManager
* commit '
524133cc793b5e372cc97c62653281605f57b5b3':
Remove API that snuck into MockPackageManager
Kenny Root [Mon, 17 Jan 2011 20:23:43 +0000 (12:23 -0800)]
am
34d2b41e: Revert "Add the {get,set}PackageObbPaths calls to API"
* commit '
34d2b41e48281d1df2c844e004740f008e699093':
Revert "Add the {get,set}PackageObbPaths calls to API"
Jamie Gennis [Mon, 20 Dec 2010 19:05:18 +0000 (11:05 -0800)]
Fix the ISurfaceComposer onTransact switch.
Two of the cases in the ISurfaceComposer onTransact switch statement
were missing 'break' statements at the end, and would fall through to
the next case block. This change adds those break statements.
Change-Id: I6dcc84263d3ea03d94612c667103283846b3dee1
Jeff Brown [Mon, 17 Jan 2011 00:19:00 +0000 (16:19 -0800)]
am
4a2e478a: Merge "Flush Binder commands in ndk looper." into gingerbread
* commit '
4a2e478a5bf6b4650181d1dfa643eadcc387fcec':
Flush Binder commands in ndk looper.
Jim Miller [Mon, 17 Jan 2011 00:16:57 +0000 (16:16 -0800)]
am
6687ecb4: Merge "Fix
3106227: use WeakReferences for receivers in DigitalClock class" into gingerbread
* commit '
6687ecb447025a1c56253d0fd67ad30af070db17':
Fix
3106227: use WeakReferences for receivers in DigitalClock class
Jeff Brown [Mon, 17 Jan 2011 00:15:32 +0000 (16:15 -0800)]
Merge "Flush Binder commands in ndk looper." into gingerbread
Jim Miller [Mon, 17 Jan 2011 00:14:52 +0000 (16:14 -0800)]
Merge "Fix
3106227: use WeakReferences for receivers in DigitalClock class" into gingerbread
Nick Pelly [Sat, 15 Jan 2011 02:38:46 +0000 (18:38 -0800)]
am
b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread
* commit '
b73203ab7e308b747819de2b2400afe971ef3bff':
Make sure service handles are live before passing to other objects.
Jean-Baptiste Queru [Sat, 15 Jan 2011 02:33:51 +0000 (18:33 -0800)]
merge
83fdc69e from gingerbread - do not merge
Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
Nick Pelly [Sat, 15 Jan 2011 02:18:25 +0000 (18:18 -0800)]
Merge "Make sure service handles are live before passing to other objects." into gingerbread
James Dong [Sat, 15 Jan 2011 00:27:48 +0000 (16:27 -0800)]
Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread
Jaikumar Ganesh [Sat, 15 Jan 2011 00:15:29 +0000 (16:15 -0800)]
am
a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
* commit '
a788a9430956dabbc1387e5cccc15f9f41639c95':
Do Not Merge: Expose insecure rfcomm Bluetooth API.
Jaikumar Ganesh [Sat, 15 Jan 2011 00:11:41 +0000 (16:11 -0800)]
Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
Dianne Hackborn [Sat, 15 Jan 2011 00:11:40 +0000 (16:11 -0800)]
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
Dianne Hackborn [Sat, 15 Jan 2011 00:11:35 +0000 (16:11 -0800)]
am
c3d0d860: Merge "Make the Phone options dialog use current language"
* commit '
c3d0d860b6f9c6b5b09ef2ae62d59139453299dd':
Make the Phone options dialog use current language
Dianne Hackborn [Sat, 15 Jan 2011 00:11:24 +0000 (16:11 -0800)]
am
0950a3ef: Merge "Added check to make orientation calculations more robust"
* commit '
0950a3ef3610184858466a4dfeb1c11c3b1ed0aa':
Added check to make orientation calculations more robust
Dianne Hackborn [Fri, 14 Jan 2011 23:39:41 +0000 (15:39 -0800)]
am
29c99aaa: Merge "Added check to make orientation calculations more robust" into gingerbread
* commit '
29c99aaaaed00c605fb6cd64de169fafad0e40ed':
Added check to make orientation calculations more robust
Dianne Hackborn [Fri, 14 Jan 2011 23:37:56 +0000 (15:37 -0800)]
Merge "Don't drop the drawable cache completely on configuration change"
Dianne Hackborn [Fri, 14 Jan 2011 23:36:58 +0000 (15:36 -0800)]
Merge "Make the Phone options dialog use current language"
Dianne Hackborn [Fri, 14 Jan 2011 23:36:52 +0000 (15:36 -0800)]
Merge "Added check to make orientation calculations more robust"
Dianne Hackborn [Fri, 14 Jan 2011 23:36:26 +0000 (15:36 -0800)]
Merge "Added check to make orientation calculations more robust" into gingerbread
Dianne Hackborn [Fri, 14 Jan 2011 23:35:52 +0000 (15:35 -0800)]
am
c058bf00: Merge "Make the Phone options dialog use current language" into gingerbread
* commit '
c058bf0043290f098fb487ee33e0da13f00134f2':
Make the Phone options dialog use current language
Dianne Hackborn [Fri, 14 Jan 2011 23:33:44 +0000 (15:33 -0800)]
Merge "Make the Phone options dialog use current language" into gingerbread
Kenny Root [Fri, 14 Jan 2011 21:05:53 +0000 (13:05 -0800)]
am
ea6bf362: Deep clone settings for system package update DO NOT MERGE
* commit '
ea6bf3628140283df24f2652b686d083b0d31ed9':
Deep clone settings for system package update DO NOT MERGE
Eric Fischer [Thu, 13 Jan 2011 21:11:39 +0000 (13:11 -0800)]
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.
Eric Fischer [Thu, 13 Jan 2011 21:08:18 +0000 (13:08 -0800)]
Merge "Add date format and map center resources for new locales." into gingerbread
Jeff Hamilton [Thu, 13 Jan 2011 20:46:16 +0000 (12:46 -0800)]
am
52d3203e: Add dispatching overrides for foreground apps.
* commit '
52d3203ef69d4babbc4dd030a15c08c0b8d1d226':
Add dispatching overrides for foreground apps.
Wei-Ta Chen [Thu, 13 Jan 2011 20:06:38 +0000 (12:06 -0800)]
am
61d9ffbf: Merge "Do not merge." into gingerbread
* commit '
61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
Do not merge.
Wei-Ta Chen [Thu, 13 Jan 2011 20:02:32 +0000 (12:02 -0800)]
Merge "Do not merge." into gingerbread
Gloria Wang [Thu, 13 Jan 2011 19:11:51 +0000 (11:11 -0800)]
am
a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit '
a220a2979937700024662be0f8fc166ca65506ed':
Initial OMA DRM forward lock contribution
Gloria Wang [Thu, 13 Jan 2011 18:51:13 +0000 (10:51 -0800)]
Merge "Initial OMA DRM forward lock contribution"
Dan Morrill [Thu, 13 Jan 2011 18:19:29 +0000 (10:19 -0800)]
am
4330b146: Adding ASL2 attribution for VisualOn.
* commit '
4330b1464d26fa693b61d496092e10ce0419ee3d':
Adding ASL2 attribution for VisualOn.
Dan Morrill [Thu, 13 Jan 2011 17:24:01 +0000 (09:24 -0800)]
Adding ASL2 attribution for VisualOn.
Change-Id: I870133fc366507d95741f8aa234776de58ba60a9
Nick Pelly [Thu, 13 Jan 2011 00:33:48 +0000 (16:33 -0800)]
am
a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
* commit '
a29bf14e1d2857debc632ce4304a1c72dded348c':
New Intent defined for RF ON/OFF events
Nick Pelly [Thu, 13 Jan 2011 00:28:59 +0000 (16:28 -0800)]
Merge "New Intent defined for RF ON/OFF events" into gingerbread
Brad Fitzpatrick [Wed, 12 Jan 2011 23:59:44 +0000 (15:59 -0800)]
am
bdb7aee0: Merge "Fix for crash when setting live wallpaper."
* commit '
bdb7aee0a4934eb138f7caaf921f6c86f350b4b7':
Fix for crash when setting live wallpaper.
Brad Fitzpatrick [Wed, 12 Jan 2011 23:45:05 +0000 (15:45 -0800)]
Merge "Fix for crash when setting live wallpaper."
Kenny Root [Wed, 12 Jan 2011 23:06:51 +0000 (15:06 -0800)]
am
e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit '
e8c04db71e347396e9537ead7113ba9f46706e44':
Add the {get,set}PackageObbPaths calls to API
Kenny Root [Wed, 12 Jan 2011 23:03:43 +0000 (15:03 -0800)]
Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
Jaikumar Ganesh [Wed, 12 Jan 2011 21:58:17 +0000 (13:58 -0800)]
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.
Jaikumar Ganesh [Wed, 12 Jan 2011 21:56:13 +0000 (13:56 -0800)]
Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
Eric Laurent [Wed, 12 Jan 2011 21:52:42 +0000 (13:52 -0800)]
am
bec4abaa: Merge "Fix issue
3302649." into gingerbread
* commit '
bec4abaa12bf6759f354b54119c5524cf9339e7b':
Fix issue
3302649.
Eric Laurent [Wed, 12 Jan 2011 21:50:51 +0000 (13:50 -0800)]
Merge "Fix issue
3302649." into gingerbread
Justin Ho [Wed, 12 Jan 2011 21:50:25 +0000 (13:50 -0800)]
am
7b667a0c: Merge "Updated flightmode assets" into gingerbread
* commit '
7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
Updated flightmode assets
Justin Ho [Wed, 12 Jan 2011 21:47:59 +0000 (13:47 -0800)]
Merge "Updated flightmode assets" into gingerbread
Kenny Root [Wed, 12 Jan 2011 19:59:49 +0000 (11:59 -0800)]
am
6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
* commit '
6688b6c31765242866fc276cea7fa241fc5b5e7b':
Allow updated system apps to retain priority
Kenny Root [Wed, 12 Jan 2011 19:56:25 +0000 (11:56 -0800)]
Merge "Allow updated system apps to retain priority" into gingerbread
Andreas Huber [Wed, 12 Jan 2011 18:35:18 +0000 (10:35 -0800)]
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.
Jeff Brown [Sun, 24 Oct 2010 21:39:33 +0000 (14:39 -0700)]
Filter virtual keys after touches. (DO NOT MERGE)
Adds a new virtualKeyQuietTimeMillis configuration resource that sets
the duration for which virtual keys will be dropped after recent touches
on screen. The default value is 0; it is intended to be overridden
per device using a resource overlay.
This change is designed to help in two cases:
1. Swipes from touchscreen into virtual key area.
2. Accidental taps in virtual key area while using on-screen keyboard.
Bug:
3089163
Change-Id: Id6733c83c2e2bc8d9553aa0e5c1fd74b741bec6e
Andreas Huber [Wed, 12 Jan 2011 00:22:33 +0000 (16:22 -0800)]
am
7e2f9cc8: DO NOT MERGE: Fix Matroska issues
* commit '
7e2f9cc81da788006790365ff11f06551fc1bc26':
DO NOT MERGE: Fix Matroska issues
repo sync [Tue, 11 Jan 2011 23:26:51 +0000 (15:26 -0800)]
resolved conflicts for merge of
e7fbfb6b to gingerbread-plus-aosp
Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26
Andreas Huber [Tue, 11 Jan 2011 21:52:12 +0000 (13:52 -0800)]
Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread
Kenny Root [Tue, 11 Jan 2011 20:27:42 +0000 (12:27 -0800)]
am
91c459ec: Copy user info from PackageSetting as well
* commit '
91c459ec7dba6d56816ff5cbd92c627e0f718915':
Copy user info from PackageSetting as well
Chung-yih Wang [Tue, 11 Jan 2011 10:15:29 +0000 (02:15 -0800)]
am
65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread
* commit '
65ba2c421c19fde04e6b294087a5a9c507964575':
Add auth. username in SipProfile.
Chung-yih Wang [Tue, 11 Jan 2011 10:08:19 +0000 (02:08 -0800)]
Merge "Add auth. username in SipProfile." into gingerbread
Nick Pelly [Mon, 10 Jan 2011 22:19:30 +0000 (14:19 -0800)]
am
ca36d863: Update API current.xml to unbreak build.
* commit '
ca36d863cc1684807e93f442c5ace89f08b9b5f5':
Update API current.xml to unbreak build.
Martijn Coenen [Mon, 10 Jan 2011 20:14:36 +0000 (12:14 -0800)]
am
25be5365: Implement canMakeReadonly().
* commit '
25be53652167300183282d170a00a6df576523f5':
Implement canMakeReadonly().
James Dong [Mon, 10 Jan 2011 20:09:09 +0000 (12:09 -0800)]
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
Nick Pelly [Mon, 10 Jan 2011 20:06:51 +0000 (12:06 -0800)]
am
92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
* commit '
92939376199a08fa0a3b01759579a4979c2a94a2':
Remove attemptDeadServiceRecovery() from TagTechnology's.
Nick Pelly [Mon, 10 Jan 2011 20:06:39 +0000 (12:06 -0800)]
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)
James Dong [Mon, 10 Jan 2011 20:04:50 +0000 (12:04 -0800)]
Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
Nick Pelly [Mon, 10 Jan 2011 20:02:36 +0000 (12:02 -0800)]
Merge "Remove attemptDeadServiceRecovery() from TagTechnology's." into gingerbread
Nick Pelly [Mon, 10 Jan 2011 20:02:26 +0000 (12:02 -0800)]
Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
Brad Fitzpatrick [Mon, 10 Jan 2011 16:32:35 +0000 (08:32 -0800)]
am
cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
* commit '
cb8427538dfdc5eae941e377b11bfd11a95fc5a5':
Closing cursor in finalizer to avoid GREF and fd leak in acore
Brad Fitzpatrick [Mon, 10 Jan 2011 16:02:03 +0000 (08:02 -0800)]
Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
Dianne Hackborn [Sun, 9 Jan 2011 21:56:07 +0000 (13:56 -0800)]
am
9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
* commit '
9aac2e2b9541c424ca02483631b08949f0e90c8c':
Referencing of "r.record.name" is occured, when "r.record" is null.
Dianne Hackborn [Sun, 9 Jan 2011 21:53:53 +0000 (13:53 -0800)]
Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
Chris Tate [Sun, 9 Jan 2011 21:31:23 +0000 (13:31 -0800)]
am
bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct
* commit '
bbff7ed44b353ff299b900a1ff50812a082206f0':
DO NOT MERGE : Ensure that the first post-restore backup pass is correct
Chris Tate [Sun, 9 Jan 2011 21:04:01 +0000 (13:04 -0800)]
am
6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
* commit '
6ec91731cbf6ee1a9a914d341fab9567d1599018':
DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
Dianne Hackborn [Sun, 9 Jan 2011 19:49:59 +0000 (11:49 -0800)]
am
433863b1: Fix issue #
3333958: Package Manager can sometimes mistakenly think...
* commit '
433863b1085248a8fdc9bcd0ac8501cc6a7b8ace':
Fix issue #
3333958: Package Manager can sometimes mistakenly think...
Dianne Hackborn [Sun, 9 Jan 2011 19:44:17 +0000 (11:44 -0800)]
am
cd23823d: Merge "Fix issue #
3227963: SecurityException: Neither user 10023 nor..." into gingerbread
* commit '
cd23823d4f533431c76baa104eb50b7803b3b391':
Fix issue #
3227963: SecurityException: Neither user 10023 nor...
Dianne Hackborn [Sun, 9 Jan 2011 19:38:15 +0000 (11:38 -0800)]
Merge "Fix issue #
3227963: SecurityException: Neither user 10023 nor..." into gingerbread
Romain Guy [Sat, 8 Jan 2011 18:18:10 +0000 (10:18 -0800)]
am
fcf3d12d: Merge "Typo in Javadoc"
* commit '
fcf3d12d701e41d6e46bae8c13776f56d54f90e8':
Typo in Javadoc
Romain Guy [Sat, 8 Jan 2011 18:04:32 +0000 (10:04 -0800)]
Merge "Typo in Javadoc"
Gloria Wang [Fri, 7 Jan 2011 23:34:08 +0000 (15:34 -0800)]
am
0544d059: Merge "DRM Framework bug fixes."
* commit '
0544d05990c0f43a143e98e71f7fc60277872806':
DRM Framework bug fixes.
Scott Main [Fri, 7 Jan 2011 23:32:04 +0000 (15:32 -0800)]
am
9b447d12: docs: catchup gingerbread to gingerbread-docs with misc changes
* commit '
9b447d122a2f0a4798f03749e9d93b9a58834fe3':
docs: catchup gingerbread to gingerbread-docs with misc changes
Scott Main [Fri, 7 Jan 2011 21:36:58 +0000 (13:36 -0800)]
am
3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
* commit '
3d0f0108f9487512195c7344be2417c30a93c3fc':
cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
Scott Main [Fri, 7 Jan 2011 21:34:54 +0000 (13:34 -0800)]
OSDN Git Service
