ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
28,234 Commits 2 Branches 0 Tags 54 MiB
f9e98289d9
Commit Graph

28234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
73431999ab Merge "Normalize output from aapt d" 2011-01-29 22:53:20 -08:00
Daniel Sandler
50168d71e8 am eec20286: Merge "Fix broken intitial notification panel animation." into honeycomb 
* commit 'eec2028698cfb80734cd03356d81671f8be31c66':
  Fix broken intitial notification panel animation.
 2011-01-29 22:39:07 -08:00
Daniel Sandler
9477e08a9d Merge "Fix broken intitial notification panel animation." into honeycomb 2011-01-29 22:37:13 -08:00
Dianne Hackborn
ca35ea9054 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.
 2011-01-29 22:35:42 -08:00
Dianne Hackborn
e0128485a8 am c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 
* commit 'c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
  DO NOT MERGE: Fix screen size compatibility mode.
 2011-01-29 22:30:57 -08:00
Dianne Hackborn
e2acfbeb83 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.
 2011-01-29 22:27:16 -08:00
Dianne Hackborn
a7ba815307 Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 2011-01-29 22:20:05 -08:00
Ken Wakasa
6e9757eba0 am 8710e76a: Follow up change to I741642ac 
* commit '8710e76a897cd546a79ee4338a4147eeb9f3e068':
  Follow up change to I741642ac
 2011-01-29 21:42:30 -08:00
Dianne Hackborn
76535fafa9 am e802b592: am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00" 
* commit 'e802b59280540ce24ea1db61907a0f1f22f01fad':
  Make AaptGroupEntry::getMncName accept mnc00
 2011-01-29 15:08:07 -08:00
Dianne Hackborn
c8d5a70b2c am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00" 
* commit '2107757dde0b3159119edcc9084fcb9a87985e88':
  Make AaptGroupEntry::getMncName accept mnc00
 2011-01-29 15:05:30 -08:00
Dianne Hackborn
695a059c50 am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00" 
* commit 'bbb5a5ce1922a168335811b177cd7341350c15cc':
  Make AaptGroupEntry::getMncName accept mnc00
 2011-01-29 14:59:02 -08:00
Jean-Baptiste Queru
37150e5b19 Merge 3100207b from gingerbread-plus-aosp 
Change-Id: Ib2eaede8b9e400e1d273f981c08a6ef82f3dd588
 2011-01-29 14:51:17 -08:00
Jean-Baptiste Queru
bc790c4ae5 am 1358b6a4: Tweak to make merges easier 
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier
 2011-01-29 14:43:33 -08:00
Dianne Hackborn
141ef82df3 Merge "Make AaptGroupEntry::getMncName accept mnc00" 2011-01-29 14:38:48 -08:00
Jean-Baptiste Queru
0fffe1b208 am 1358b6a4: Tweak to make merges easier 
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier
 2011-01-29 14:32:04 -08:00
Jean-Baptiste Queru
39e41351f0 Merge 6b739dc7 from gingerbread 
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
 2011-01-29 12:59:20 -08:00
Jason parks
5b6ec16bec 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.
 2011-01-29 12:04:11 -08:00
Jason parks
9f94e2cedc Merge "Update the encryption password when the device password is changed." into honeycomb 2011-01-29 12:02:19 -08:00
Eric Fischer
ed22221952 am 5f2def8c: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84':
  Import revised translations.  DO NOT MERGE
 2011-01-29 11:25:30 -08:00
Dirk Dougherty
81e4229454 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.
 2011-01-29 11:16:13 -08:00
Andreas Huber
7d56d0403b 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.
 2011-01-29 11:16:07 -08:00
Jean-Baptiste Queru
d56d131095 Merge 0ef57993 from gingerbread 
Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
 2011-01-29 11:04:41 -08:00
Jim Miller
d53a94a93b 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]
 2011-01-29 11:00:28 -08:00
Jean-Baptiste Queru
da285cf140 Merge d350dc04 from gingerbread 
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
 2011-01-29 10:57:48 -08:00
Eric Fischer
17e93c8c67 am 3d73c4d3: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
  Import revised translations.  DO NOT MERGE
 2011-01-29 10:40:17 -08:00
Nick Pelly
368e77b240 am 21d0a173: Fix build - javadoc. 
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
  Fix build - javadoc.
 2011-01-29 10:40:07 -08:00
Scott Main
e093a7bfbe am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread 
* commit '7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
  cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
 2011-01-29 10:40:01 -08:00
Jean-Baptiste Queru
8e5bb47d02 Merge eab0e97b from gingerbread 
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
 2011-01-29 10:38:09 -08:00
Robert Greenwalt
4164387e86 am 89a54408: (-s ours) Merge "Update networktype before sending state change." into gingerbread 
* commit '89a544088fcfa849be0d8824a2ac0a545950847b':
  Update networktype before sending state change.
 2011-01-29 10:26:33 -08:00
Dirk Dougherty
15bfd7b15a am 591a5f86: Doc change: fix adt archive filename. 
* commit '591a5f86bd4b3f1732b935daad909e4e63149f01':
  Doc change: fix adt archive filename.
 2011-01-29 10:16:14 -08:00
Jean-Baptiste Queru
c570aad4a0 Merge ba3dd323 from gingerbread 
Change-Id: I615bf5177abbc680292e0116491da58835c7396f
 2011-01-29 10:11:06 -08:00
Scott Main
26a2a016c0 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-29 09:59:33 -08:00
Andreas Huber
713ed42e3a am 2dce338e: (-s ours) 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-29 09:55:13 -08:00
Dianne Hackborn
8ae2d642e6 am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread 
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
  Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
 2011-01-29 09:54:53 -08:00
Jean-Michel Trivi
4e486242d6 am 2ba92c71: (-s ours) do not merge bug 3370834 Cherrypick from master 
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
  do not merge bug 3370834 Cherrypick from master
 2011-01-29 09:54:41 -08:00
satok
6784e8dac3 am e40dea0d: Fix a bug that IME switch disappiers at switching IME subtype. 
* commit 'e40dea0d06ec1c04db80191fd2965363b4fac781':
  Fix a bug that IME switch disappiers at switching IME subtype.
 2011-01-29 09:50:03 -08:00
Kenny Root
1399426de9 am 138757db: Merge "Make OBB results a one-way call" into gingerbread 
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
  Make OBB results a one-way call
 2011-01-29 09:48:07 -08:00
Jean-Baptiste Queru
ad1e202aef Merge c33acae9 from gingerbread 
Change-Id: I52b5045cbef6e4927f86830498050977b2829859
 2011-01-29 09:45:41 -08:00
Mathias Agopian
7e857823df am 239fd805: (-s ours) Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread 
* commit '239fd805ef7c0e4116b0a89e20caaf287e91f017':
  fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
 2011-01-29 09:40:51 -08:00
Mathias Agopian
73e4ee6289 am 1955a5c9: (-s ours) Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread 
* commit '1955a5c9da421dc89bb1a1dd3d3193159192cde9':
  partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
 2011-01-29 09:40:34 -08:00
Mathias Agopian
c9682070f0 am d0441f92: (-s ours) Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread 
* commit 'd0441f921b2b1879fb44041f521d9bfaa5a547d0':
  fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
 2011-01-29 09:40:25 -08:00
Mathias Agopian
13c0c9559d am 043a3cdd: (-s ours) Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread 
* commit '043a3cddf67e2baf38711bcb125084599f8f9802':
  workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
 2011-01-29 09:40:14 -08:00
Mathias Agopian
8b770ca695 am d3fcd0a1: (-s ours) Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread 
* commit 'd3fcd0a1c923498921107bb44fbc8b24582a170a':
  minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
 2011-01-29 09:40:06 -08:00
Jean-Baptiste Queru
c3d0dea07d Merge f126ad3b from gingerbread 
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
 2011-01-29 09:37:44 -08:00
Jean-Baptiste Queru
6451d02517 am 34ebb5bf: (-s ours) am 87d19759: Delete browerplugin tests - do not merge 
* commit '34ebb5bfec0794d5852b47edaa8b9d4cea22e515':
  Delete browerplugin tests - do not merge
 2011-01-29 09:36:02 -08:00
Jean-Baptiste Queru
8f767cf93c am 88d7300d: (-s ours) am d4c8cec0: am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit '88d7300d2abaf638c2c0b5505b657b401f881c14':
  Delete browerplugin tests - do not merge
 2011-01-29 09:35:55 -08:00
Marco Nelissen
1fa0ee01da am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread 
* commit 'c929677e017759047d94599faa1b80ebe278fefb':
  Increase the number of useful bits in the spectrum.
 2011-01-29 09:32:05 -08:00
Robert Greenwalt
e0b71f1446 resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp 
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
 2011-01-29 09:32:04 -08:00
Nick Pelly
8017007350 am b134223f: Make Mifare Classic increment/decrement operands little endian 
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
  Make Mifare Classic increment/decrement operands little endian
 2011-01-29 09:31:56 -08:00
Hung-ying Tyan
6d3a36b76e am cc019c0c: Merge "Get mute state from active call." into gingerbread 
* commit 'cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
  Get mute state from active call.
 2011-01-29 09:31:40 -08:00