OSDN Git Service
Jean-Baptiste Queru [Mon, 31 Jan 2011 22:00:52 +0000 (14:00 -0800)]
Jamie Gennis [Mon, 31 Jan 2011 21:56:28 +0000 (13:56 -0800)]
am
8df2c424: Merge "Fix a multithreading bug in libagl\'s EGL." into honeycomb
* commit '
8df2c42413cfdde1c4290b4797a09c4bafb6c3bc':
Fix a multithreading bug in libagl's EGL.
Dianne Hackborn [Mon, 31 Jan 2011 21:56:24 +0000 (13:56 -0800)]
am
e9da0c1d: Merge "Fix issue #
3408542: "resizeable" attribute required to get out of compat mode" into honeycomb
* commit '
e9da0c1de179e3cdb2d3709bde2b5cb6eb192230':
Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
Gilles Debunne [Mon, 31 Jan 2011 21:56:21 +0000 (13:56 -0800)]
am
c1eb127f: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
* commit '
c1eb127f4e19c1f86e4b18c2c1daebe2404eeb93':
Tabs are resized to make sure they fit in their parent.
Jamie Gennis [Mon, 31 Jan 2011 21:38:27 +0000 (13:38 -0800)]
Merge "Fix a multithreading bug in libagl's EGL." into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 21:37:50 +0000 (13:37 -0800)]
Merge "Fix issue #
3408542: "resizeable" attribute required to get out of compat mode" into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:03:59 +0000 (12:03 -0800)]
Gilles Debunne [Mon, 31 Jan 2011 20:01:34 +0000 (12:01 -0800)]
Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 19:55:40 +0000 (11:55 -0800)]
Daniel Sandler [Mon, 31 Jan 2011 19:49:03 +0000 (11:49 -0800)]
am
4f63da64: Merge "Alignment in the title area of the notification panel." into honeycomb
* commit '
4f63da64d82131388ff02586e5fe19662fe641de':
Alignment in the title area of the notification panel.
Daniel Sandler [Mon, 31 Jan 2011 19:46:57 +0000 (11:46 -0800)]
Merge "Alignment in the title area of the notification panel." into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 19:32:33 +0000 (11:32 -0800)]
Merge "stubs"
Joe Onorato [Mon, 31 Jan 2011 19:26:51 +0000 (11:26 -0800)]
am
fe6fd242: Merge "Mask out the non public bits, not the public ones." into honeycomb
* commit '
fe6fd242867022576a99fcd5fd6078fb7bab8451':
Mask out the non public bits, not the public ones.
Joe Onorato [Mon, 31 Jan 2011 19:25:06 +0000 (11:25 -0800)]
Merge "Mask out the non public bits, not the public ones." into honeycomb
Gilles Debunne [Mon, 31 Jan 2011 19:13:24 +0000 (11:13 -0800)]
am
ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
* commit '
ccfcd9e813d090ec9b4390b5217b32f73dd8263d':
Fxi initial error popup dialog in TextEdit and refreshed assets.
Gilles Debunne [Mon, 31 Jan 2011 19:10:53 +0000 (11:10 -0800)]
Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
Jeff Hamilton [Mon, 31 Jan 2011 19:03:50 +0000 (11:03 -0800)]
am
ddd11292: Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
* commit '
ddd11292d1be8d33989e3a67bf6398464ef2632c':
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
Jeff Hamilton [Mon, 31 Jan 2011 19:01:07 +0000 (11:01 -0800)]
Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
Jeff Hamilton [Mon, 31 Jan 2011 18:11:46 +0000 (10:11 -0800)]
am
f7176dfb: am
113834c5: Commit the final API for level 10.
* commit '
f7176dfbd284f7da49e5bccc2aa886b42039ba4a':
Commit the final API for level 10.
Jeff Hamilton [Mon, 31 Jan 2011 18:05:13 +0000 (10:05 -0800)]
am
113834c5: Commit the final API for level 10.
* commit '
113834c5ab30bfc554202d0f3144a662d77f2484':
Commit the final API for level 10.
Daniel Sandler [Mon, 31 Jan 2011 17:08:00 +0000 (09:08 -0800)]
am
cb9d4d28: Merge "Kill spurious animations when vetoing notifications." into honeycomb
* commit '
cb9d4d28be41c72a8c6f254bf8fdaac5f41e0b6f':
Kill spurious animations when vetoing notifications.
Daniel Sandler [Mon, 31 Jan 2011 17:04:32 +0000 (09:04 -0800)]
Merge "Kill spurious animations when vetoing notifications." into honeycomb
Tadashi G. Takaoka [Mon, 31 Jan 2011 16:49:30 +0000 (08:49 -0800)]
am
81f4b582: Merge "Fix hardware keyboard switch listener" into honeycomb
* commit '
81f4b582d4f3547bcd432da6bcb21d4ef414723d':
Fix hardware keyboard switch listener
Tadashi G. Takaoka [Mon, 31 Jan 2011 16:47:12 +0000 (08:47 -0800)]
Merge "Fix hardware keyboard switch listener" into honeycomb
Leon Scroggins [Mon, 31 Jan 2011 16:24:31 +0000 (08:24 -0800)]
am
22e883dd: For Textareas, do not use UI side layers.
* commit '
22e883dd4a400122003506f47b228378000dd12f':
For Textareas, do not use UI side layers.
Gil Dobjanschi [Mon, 31 Jan 2011 12:13:06 +0000 (04:13 -0800)]
am
2bb13573: Bug fix:
3405930 Crash editing overlay text
* commit '
2bb13573d619e3371d06847d36db78a20b17dfab':
Bug fix:
3405930 Crash editing overlay text
Wink Saville [Mon, 31 Jan 2011 07:14:39 +0000 (23:14 -0800)]
am
cde85d57: Merge "Add debug for tracking bug
3404006." into honeycomb
* commit '
cde85d573873adce9ebcf0d2c4c2c5c1b8d465cc':
Add debug for tracking bug
3404006.
Wink Saville [Mon, 31 Jan 2011 07:12:35 +0000 (23:12 -0800)]
Merge "Add debug for tracking bug
3404006." into honeycomb
Bart Sears [Mon, 31 Jan 2011 04:08:13 +0000 (20:08 -0800)]
am
e3004e78: New DroidSansFallback font file from Ascender
* commit '
e3004e7867925e70bf4930384a265106f45f87d6':
New DroidSansFallback font file from Ascender
Dheeraj Sharma [Mon, 31 Jan 2011 02:14:40 +0000 (18:14 -0800)]
am
cd73d1ed: Merge "Fix for issue
3404671 Crash when exporting movie in JNI" into honeycomb
* commit '
cd73d1ed6d1149a2ae642e87ffe8d89100fbafec':
Fix for issue
3404671 Crash when exporting movie in JNI
Dheeraj Sharma [Mon, 31 Jan 2011 02:12:25 +0000 (18:12 -0800)]
Merge "Fix for issue
3404671 Crash when exporting movie in JNI" into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 02:05:08 +0000 (18:05 -0800)]
am
260c3c77: Fix issue #
3381489: IllegalStateException: attempt to re-open...
* commit '
260c3c77d9b340164e055f87002c64d78da6e836':
Fix issue #
3381489: IllegalStateException: attempt to re-open...
Joe Onorato [Mon, 31 Jan 2011 01:58:47 +0000 (17:58 -0800)]
am
fba54f62: Merge "I declare settings panel icon VICTORY!" into honeycomb
* commit '
fba54f620ff155ede6de7d73f1b6a0003839b1c4':
I declare settings panel icon VICTORY!
Joe Onorato [Mon, 31 Jan 2011 01:56:25 +0000 (17:56 -0800)]
Merge "I declare settings panel icon VICTORY!" into honeycomb
John Reck [Mon, 31 Jan 2011 01:12:29 +0000 (17:12 -0800)]
am
13934c2d: Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
* commit '
13934c2d71046cdd2e7ca33528b91cb83f82dc13':
Prevent SET_SCROLL_OFFSET spam from clogging tubes
John Reck [Mon, 31 Jan 2011 00:55:23 +0000 (16:55 -0800)]
Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
Dharmaray Kundargi [Mon, 31 Jan 2011 00:35:08 +0000 (16:35 -0800)]
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
Dharmaray Kundargi [Mon, 31 Jan 2011 00:35:03 +0000 (16:35 -0800)]
am
ff843254: Merge "Merging the same files on top of tree." into honeycomb
* commit '
ff8432548eb96655190486ee0f0fa08de5451e66':
Merging the same files on top of tree.
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:34:56 +0000 (16:34 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:32:44 +0000 (16:32 -0800)]
am
1314bdb2: am
e88fa50b: Merge from open-source gingerbread
* commit '
1314bdb2b22ae3613c3e08ae278dbc70f90b965c':
fix failing thread object run
Dharmaray Kundargi [Mon, 31 Jan 2011 00:32:07 +0000 (16:32 -0800)]
Merge "Merging the same files on top of tree." into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:26:18 +0000 (16:26 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:19:59 +0000 (16:19 -0800)]
am
e88fa50b: Merge from open-source gingerbread
* commit '
e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
fix failing thread object run
Adam Powell [Mon, 31 Jan 2011 00:14:54 +0000 (16:14 -0800)]
am
c9cb3083: Merge "Fix bug
3405899 - android.view.WindowManager" into honeycomb
* commit '
c9cb30837116b138a91b251e5217a644231eebef':
Fix bug
3405899 - android.view.WindowManager$BadTokenException
Adam Powell [Mon, 31 Jan 2011 00:12:56 +0000 (16:12 -0800)]
Merge "Fix bug
3405899 - android.view.WindowManager$BadTokenException" into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 00:11:36 +0000 (16:11 -0800)]
am
54ad3611: Merge "Fix issue #
3404571: Commit final APIs" into honeycomb
* commit '
54ad36119460b850641556a12b845eadc9875cb4':
Fix issue #
3404571: Commit final APIs
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:07:25 +0000 (16:07 -0800)]
am
25503f1c: Merge from gingerbread
* commit '
25503f1c9f0b5f718052b71dc5b21d1c8576d015':
fix failing thread object run
Joe Onorato [Mon, 31 Jan 2011 00:03:59 +0000 (16:03 -0800)]
am
4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
* commit '
4de68baed4bf18b33dc38f89f25410d3d5edfecf':
Check for the STATUS_BAR permission for the system UI properties.
Dianne Hackborn [Mon, 31 Jan 2011 00:01:36 +0000 (16:01 -0800)]
Merge "Fix issue #
3404571: Commit final APIs" into honeycomb
Joe Onorato [Mon, 31 Jan 2011 00:00:52 +0000 (16:00 -0800)]
Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
Jamie Gennis [Sun, 30 Jan 2011 23:59:36 +0000 (15:59 -0800)]
Fix a multithreading bug in libagl's EGL.
The bug caused libagl to return 0 from eglGetError if an EGL error value
(including EGL_SUCCESS) was set on a different thread but not yet on the
current thread.
Bug:
3403756
Change-Id: Ifd965091d116745c2e22c121151ade9e78eb14c6
Gilles Debunne [Sun, 30 Jan 2011 23:53:03 +0000 (15:53 -0800)]
am
236b9872: Merge "Auto-clearing setError popup" into honeycomb
* commit '
236b9872140599d1856d48e53b8e109e506fd88f':
Auto-clearing setError popup
Gilles Debunne [Sun, 30 Jan 2011 23:49:38 +0000 (15:49 -0800)]
Merge "Auto-clearing setError popup" into honeycomb
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:35:06 +0000 (15:35 -0800)]
Merge from gingerbread
Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:29:52 +0000 (15:29 -0800)]
Merge from open-source gingerbread
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
Dheeraj Sharma [Sun, 30 Jan 2011 23:22:39 +0000 (15:22 -0800)]
am
45911e19: Merge "Fix for issue
3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb
* commit '
45911e1969fd1843bac5806e06f351123b67f596':
Fix for issue
3400229 Pan and Zoom effect is not accurate in JAVA and JNI
Dheeraj Sharma [Sun, 30 Jan 2011 23:20:49 +0000 (15:20 -0800)]
Merge "Fix for issue
3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:17:33 +0000 (15:17 -0800)]
Merge "fix failing thread object run" into gingerbread
Dheeraj Sharma [Sun, 30 Jan 2011 23:10:25 +0000 (15:10 -0800)]
am
167e7488: Merge "
3404665 Preview window is blank after returning from playing exported movie" into honeycomb
* commit '
167e7488af4d53673ff2fcc0723ae2a1584f5194':
3404665 Preview window is blank after returning from playing exported movie
Dheeraj Sharma [Sun, 30 Jan 2011 23:08:12 +0000 (15:08 -0800)]
Merge "
3404665 Preview window is blank after returning from playing exported movie" into honeycomb
Jamie Gennis [Sun, 30 Jan 2011 23:03:03 +0000 (15:03 -0800)]
am
62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb
* commit '
628845056282a0c5b1a212ce5aeeaac092b91ec8':
Reset ANativeWindow crop on buffer geometry changes.
Jamie Gennis [Sun, 30 Jan 2011 23:00:44 +0000 (15:00 -0800)]
Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb
Daniel Sandler [Sun, 30 Jan 2011 21:40:19 +0000 (13:40 -0800)]
am
71a22b3b: Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb
* commit '
71a22b3bc7cb4a721378ef38d43bce94f5b0e5bd':
Dismiss the ticker early if the status bar is tapped.
Daniel Sandler [Sun, 30 Jan 2011 21:36:47 +0000 (13:36 -0800)]
Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb
Joe Onorato [Sun, 30 Jan 2011 21:19:57 +0000 (13:19 -0800)]
am
f2057d90: Merge changes I09e8c4eb,I91a0e05f into honeycomb
* commit '
f2057d907b5d9c75086337e840f70b5061b2a5aa':
Use a DateFormat that fits.
Update the network info when the configuration changes.
Joe Onorato [Sun, 30 Jan 2011 21:18:16 +0000 (13:18 -0800)]
Merge changes I09e8c4eb,I91a0e05f into honeycomb
* changes:
Use a DateFormat that fits.
Update the network info when the configuration changes.
The Android Open Source Project [Sun, 30 Jan 2011 20:40:39 +0000 (12:40 -0800)]
Reconcile gingerbread-plus-aosp and honeycomb
Change-Id: I7ca5acfee971105e3f3d6a674f82da0e890b0434
The Android Open Source Project [Sun, 30 Jan 2011 20:40:32 +0000 (12:40 -0800)]
Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
Jeff Brown [Sun, 30 Jan 2011 20:10:07 +0000 (12:10 -0800)]
am
3c89f6d1: Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb
* commit '
3c89f6d1bd0821d0ae0205a5b48176156735aaac':
Add "Use physical keyboard" option to system bar IME button.
Jeff Brown [Sun, 30 Jan 2011 20:07:49 +0000 (12:07 -0800)]
Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb
Dianne Hackborn [Sun, 30 Jan 2011 19:02:29 +0000 (11:02 -0800)]
am
e97a12e3: Fix screen size compatibility mode.
* commit '
e97a12e340dfdc246b531dfb49596628bd24e81b':
Fix screen size compatibility mode.
Joe Malin [Sun, 30 Jan 2011 17:48:49 +0000 (09:48 -0800)]
am
51990f9b: Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb
* commit '
51990f9b0c7c0a22e1a3440c620ab97ebe4209c9':
sdk doc change: Copy/Paste/Drag/Drop
Joe Malin [Sun, 30 Jan 2011 17:45:59 +0000 (09:45 -0800)]
Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb
Dianne Hackborn [Sun, 30 Jan 2011 07:07:48 +0000 (23:07 -0800)]
am
a1f5e82f: am
a30063d8: am
25eb0464: Merge "Normalize output from aapt d"
* commit '
a1f5e82f37c77af7b1d630b5bca715d1742f1234':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 07:04:50 +0000 (23:04 -0800)]
am
a30063d8: am
25eb0464: Merge "Normalize output from aapt d"
* commit '
a30063d80c08434ac3c7316f338c6d54110449ab':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 07:01:20 +0000 (23:01 -0800)]
am
25eb0464: Merge "Normalize output from aapt d"
* commit '
25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 06:53:20 +0000 (22:53 -0800)]
Merge "Normalize output from aapt d"
Daniel Sandler [Sun, 30 Jan 2011 06:39:07 +0000 (22:39 -0800)]
am
eec20286: Merge "Fix broken intitial notification panel animation." into honeycomb
* commit '
eec2028698cfb80734cd03356d81671f8be31c66':
Fix broken intitial notification panel animation.
Daniel Sandler [Sun, 30 Jan 2011 06:37:13 +0000 (22:37 -0800)]
Merge "Fix broken intitial notification panel animation." into honeycomb
Dianne Hackborn [Sun, 30 Jan 2011 06:35:42 +0000 (22:35 -0800)]
am
71bb59f9: (-s ours) am
c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
* commit '
71bb59f9e6799083830077dbb7e0f1effdd3faf7':
DO NOT MERGE: Fix screen size compatibility mode.
Dianne Hackborn [Sun, 30 Jan 2011 06:30:57 +0000 (22:30 -0800)]
am
c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
* commit '
c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
DO NOT MERGE: Fix screen size compatibility mode.
Dianne Hackborn [Sun, 30 Jan 2011 06:27:16 +0000 (22:27 -0800)]
am
c12cdda9: (-s ours) Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
* commit '
c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
DO NOT MERGE: Fix screen size compatibility mode.
Dianne Hackborn [Sun, 30 Jan 2011 06:20:05 +0000 (22:20 -0800)]
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
Ken Wakasa [Sun, 30 Jan 2011 05:42:30 +0000 (21:42 -0800)]
am
8710e76a: Follow up change to I741642ac
* commit '
8710e76a897cd546a79ee4338a4147eeb9f3e068':
Follow up change to I741642ac
Dianne Hackborn [Sat, 29 Jan 2011 23:08:07 +0000 (15:08 -0800)]
am
e802b592: am
2107757d: am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
e802b59280540ce24ea1db61907a0f1f22f01fad':
Make AaptGroupEntry::getMncName accept mnc00
Dianne Hackborn [Sat, 29 Jan 2011 23:05:30 +0000 (15:05 -0800)]
am
2107757d: am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
2107757dde0b3159119edcc9084fcb9a87985e88':
Make AaptGroupEntry::getMncName accept mnc00
Dianne Hackborn [Sat, 29 Jan 2011 22:59:02 +0000 (14:59 -0800)]
am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
bbb5a5ce1922a168335811b177cd7341350c15cc':
Make AaptGroupEntry::getMncName accept mnc00
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:51:17 +0000 (14:51 -0800)]
Merge
3100207b from gingerbread-plus-aosp
Change-Id: Ib2eaede8b9e400e1d273f981c08a6ef82f3dd588
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:43:33 +0000 (14:43 -0800)]
am
1358b6a4: Tweak to make merges easier
* commit '
1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
Dianne Hackborn [Sat, 29 Jan 2011 22:38:48 +0000 (14:38 -0800)]
Merge "Make AaptGroupEntry::getMncName accept mnc00"
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:32:04 +0000 (14:32 -0800)]
am
1358b6a4: Tweak to make merges easier
* commit '
1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
Jean-Baptiste Queru [Sat, 29 Jan 2011 20:59:11 +0000 (12:59 -0800)]
Merge
6b739dc7 from gingerbread
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
Jason parks [Sat, 29 Jan 2011 20:04:11 +0000 (12:04 -0800)]
am
a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb
* commit '
a2e765ef1ad2cb907a4ae0a93bb15e4764ebb59a':
Update the encryption password when the device password is changed.
Jason parks [Sat, 29 Jan 2011 20:02:19 +0000 (12:02 -0800)]
Merge "Update the encryption password when the device password is changed." into honeycomb
Eric Fischer [Sat, 29 Jan 2011 19:25:30 +0000 (11:25 -0800)]
am
5f2def8c: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
Dirk Dougherty [Sat, 29 Jan 2011 19:16:13 +0000 (11:16 -0800)]
am
fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit '
fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
Doc change: Add time-lapse video to 3.0 highlights.
Andreas Huber [Sat, 29 Jan 2011 19:16:07 +0000 (11:16 -0800)]
am
b6c2e2b4: (-s ours) DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit '
b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Jean-Baptiste Queru [Sat, 29 Jan 2011 19:03:55 +0000 (11:03 -0800)]
Merge
0ef57993 from gingerbread
Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
Jim Miller [Sat, 29 Jan 2011 19:00:28 +0000 (11:00 -0800)]
am
226e5756: (-s ours) Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
* commit '
226e57563c3110aa688fc41f10b7a96cd21b6231':
Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
Jean-Baptiste Queru [Sat, 29 Jan 2011 18:57:48 +0000 (10:57 -0800)]
Merge
d350dc04 from gingerbread
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
OSDN Git Service
