ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
41,640 Commits 2 Branches 0 Tags 54 MiB
1d151e1aba
Commit Graph

41640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
990f3c5fe9 am caa8e69a: Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1 
* commit 'caa8e69a65e15ce2d9e52b18c7caa547eb9a2f48':
  Fix issue #5756204: Crespo IME briefly appears shortened when...
 2011-12-13 15:41:54 -08:00
Dianne Hackborn
1b90c5bd0d Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1 2011-12-13 15:40:18 -08:00
Gilles Debunne
aed8f093a0 am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 
* commit '19636dc4217078a3bfd4b3909b5ac05f8a9aca8f':
  Do not spell check the foreground ExtractEditText.
 2011-12-13 15:38:43 -08:00
Gilles Debunne
8d0b3f3474 Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 2011-12-13 15:36:48 -08:00
Dianne Hackborn
8ec06aaf4a am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1 
* commit '19a06fe93cccb4b1dd224b8456969821a19b07ef':
  Fix issue #5755172: Soft menu key disappears when menu is open
 2011-12-13 13:42:07 -08:00
Gilles Debunne
75ce7098b3 am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1 
* commit '67d54ac017494229eed27a184159461d63201a9f':
  NPE in GMail / TextLine
 2011-12-13 13:40:00 -08:00
Dianne Hackborn
f3600e569a Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1 2011-12-13 13:38:56 -08:00
Gilles Debunne
366d1432ed Merge "NPE in GMail / TextLine" into ics-mr1 2011-12-13 13:37:29 -08:00
Scott Main
d0f5b5ba80 am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0 
* commit 'c9295b2069af6530fba37a16c88757acaaff63e8':
  Created Android University lesson for Multiple APKs.
 2011-12-13 13:13:15 -08:00
Scott Main
95c8297d4f am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens. 
* commit '37191e1dc783a5558eb8ee4f096bd8350c34415d':
  AndroidU lesson on designing for multiple screens.
 2011-12-13 13:13:07 -08:00
Scott Main
db20a9b152 am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0 
* commit 'fc279e51c0bca8086b87bd49e95367c400cb61b4':
  Created Android University lesson for Multiple APKs.
 2011-12-13 13:10:45 -08:00
Scott Main
568bf65826 am 801fda54: AndroidU lesson on designing for multiple screens. 
* commit '801fda548c719a8618e7f4cd64cad8404b0970b9':
  AndroidU lesson on designing for multiple screens.
 2011-12-13 13:10:42 -08:00
Scott Main
f07b37cde6 Merge "Created Android University lesson for Multiple APKs." into ics-mr0 2011-12-13 12:25:38 -08:00
Andreas Huber
a0c39d8bef am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 
* commit '3ab630084071eb5dc7f92b4a8a617f8cef10c514':
  DO NOT MERGE: Support for parsing of "folded" RTSP header values
 2011-12-13 12:01:46 -08:00
Andreas Huber
3ef0a52028 Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 2011-12-13 11:59:50 -08:00
The Android Open Source Project
fca20c9b5d Reconcile with ics-mr1-release 
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
 2011-12-13 05:11:43 -08:00
The Android Automerger
0998dbaa26 merge in ics-mr1-release history after reset to ics-mr1 2011-12-12 22:08:59 -08:00
Jeff Sharkey
149427a372 am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 
* commit 'f0bbc494d638f4c77e688bf9410027f453301559':
  Avoid NPE when missing network stats.
 2011-12-12 20:21:34 -08:00
Jeff Sharkey
b4d1ec8d9d Merge "Avoid NPE when missing network stats." into ics-mr1 2011-12-12 20:19:27 -08:00
Mike Cleron
24643b6a70 am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 
* commit '840201d6e2d7d53e42a31ffeb2ef454982882d12':
  Update VIBRATE_ON to a supported value when upgrading from GB.
 2011-12-12 18:17:46 -08:00
Mike Cleron
ee5de0ffff Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 2011-12-12 18:15:59 -08:00
Dianne Hackborn
76cc3dfcff am 359bb3b4: Final API 15. 
* commit '359bb3b432b21590c12588c3ca3880ac17aadc96':
  Final API 15.
 2011-12-12 17:04:04 -08:00
Dianne Hackborn
38478c79f5 am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 
* commit 'a1279586dd1a866dd58d669aa0980d71f6c589d9':
  SDK only: now that support lib is in SDK, we can link to it.
 2011-12-12 16:12:40 -08:00
Dianne Hackborn
ff934866fc Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 2011-12-12 16:09:54 -08:00
Gilles Debunne
c8283d35ee am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1 
* commit 'a1277de3c393fb0861d26ec5551ae4247e32dee4':
  Prevent a memory leak in TextLine.
 2011-12-12 15:56:33 -08:00
Gilles Debunne
7d4454cfd5 am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1 
* commit '1fb90497b73b1560c55f1cb73cd394c3b8714212':
  Text blinking cursor hard to see.
 2011-12-12 15:54:38 -08:00
Gilles Debunne
8754c8f146 Merge "Prevent a memory leak in TextLine." into ics-mr1 2011-12-12 15:53:25 -08:00
Gilles Debunne
8d1381027d Merge "Text blinking cursor hard to see." into ics-mr1 2011-12-12 15:52:39 -08:00
Adam Powell
42fa6012c0 am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 
* commit '9c92fcd91c67a98f3a767255e7d3748bca3ef751':
  Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
 2011-12-12 15:42:22 -08:00
Adam Powell
3786085f8e Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 2011-12-12 15:40:00 -08:00
Jamie Gennis
51ce74df34 am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 
* commit 'a1dee3f500eccedbf5e50d466315fb28ba812cfc':
  SurfaceTexture: fix a verbose-log compile error
 2011-12-12 14:12:33 -08:00
Jamie Gennis
07584d6321 Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 2011-12-12 14:10:04 -08:00
Raphael
65e3a8c971 am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 
* commit '2ace3b01ab9447ce9fda2f578e31c1c11f4837cb':
  Merge "AAPT fix printf %zd crash on Windows". Do not merge.
 2011-12-12 13:16:35 -08:00
Raphael
afcfa2f23a Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 2011-12-12 13:14:12 -08:00
Matthew Xie
ecc1b9a994 am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 
* commit 'ed0830c502d7403d69abfd8247c046ac2746ac8c':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting
 2011-12-12 12:09:13 -08:00
Matthew Xie
027bd44923 Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 2011-12-12 12:07:39 -08:00
Eric Fischer
44644a1666 am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '386f208489d85d81755b64e92a84290953accfc0':
  Import revised translations.  DO NOT MERGE
 2011-12-12 11:06:38 -08:00
Eric Fischer
0beca4d419 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-12 11:04:39 -08:00
The Android Open Source Project
6952dcd51d Reconcile with ics-mr1-release 
Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3
 2011-12-12 07:59:17 -08:00
The Android Open Source Project
02f2cff12c Merge from ics-mr1 
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
 2011-12-12 07:47:43 -08:00
The Android Automerger
3f989e2d67 merge in ics-mr1-release history after reset to ics-mr1 2011-12-09 16:17:04 -08:00
Justin Ho
3a1fd1a624 am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 
* commit '1cec30a182c1963beda4b6f11cfae9fa38061e68':
  Quick settings icons updated to match ics style on tablet
 2011-12-09 15:43:48 -08:00
Justin Ho
1504118362 Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 2011-12-09 15:42:10 -08:00
Jamie Gennis
988637e559 SurfaceTexture: fix a verbose-log compile error 
Change-Id: I045231207e068d950bb0cb5085717af5d9454ed1
 2011-12-09 15:07:44 -08:00
Jeff Tinker
326de23854 am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 
* commit 'ef664f62a1525e8f53d0937e889333544ffef3ad':
  Fix drm flag setting missed in false drm recognition fix.
 2011-12-09 11:13:39 -08:00
Jeff Tinker
7052519a97 Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 2011-12-09 11:11:56 -08:00
Joe Fernandez
0de9fa469d am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 
* commit '4b3227de17b6b4ee776cfb26aa33ce8ff1c195f0':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
 2011-12-09 10:47:59 -08:00
Joe Fernandez
f0ac62bfe9 am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 
* commit '89c3bc38421a3f01b39f0246e53884bdf8b14415':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
 2011-12-09 10:45:44 -08:00
Joe Fernandez
da1d9aa974 Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 2011-12-09 10:43:32 -08:00
Gilles Debunne
3d2918c20f am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1 
* commit 'caf4ead320499cc9a7a2e3eb17beaaf92b391212':
  Blinking cursor in Talk
 2011-12-09 09:36:23 -08:00