ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
41,368 Commits 2 Branches 0 Tags 54 MiB
38478c79f5
Commit Graph

41368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gilles Debunne
09743f40ad Merge "Blinking cursor in Talk" into ics-mr1 2011-12-09 09:34:04 -08:00
The Android Open Source Project
395bca9c2f Reconcile with ics-mr1-release 
Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7
 2011-12-09 07:11:10 -08:00
The Android Automerger
0c0b586205 merge in ics-mr1-release history after reset to ics-mr1 2011-12-09 06:58:10 -08:00
James Dong
b7dff74609 am aadbd80b: Fixed the false drm recognition. 
* commit 'aadbd80b307c817698ce5110ff8e002804d1b230':
  Fixed the false drm recognition.
 2011-12-09 00:17:56 -08:00
Gilles Debunne
8590c22036 am be5f49fb: Performance improvements for long text edition. 
* commit 'be5f49fb6e17e0b9588d3b94022b7e3eb6d47317':
  Performance improvements for long text edition.
 2011-12-08 18:35:22 -08:00
Gilles Debunne
fb33136654 am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1 
* commit 'df3722895172e03c81787f62d922daabaad3e20b':
  Fixed SpellCheckerSessions leak in TextView
 2011-12-08 18:19:57 -08:00
Gilles Debunne
61685f375f Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1 2011-12-08 18:18:25 -08:00
Gilles Debunne
94c12ded11 am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1 
* commit '316ca5059ebd7270a04da5649d25653c355e158d':
  Re-use SpanSets in TextLine
 2011-12-08 18:00:12 -08:00
Gilles Debunne
4ef3648be8 Merge "Re-use SpanSets in TextLine" into ics-mr1 2011-12-08 17:58:24 -08:00
Joe Malin
9045e2e3c8 am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit '556e4ca54161be17333ec98fadc113485120a6e8':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-08 17:46:44 -08:00
Joe Malin
2cbbddc0e1 am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit '0a9005ed58d3a6173e8fffbd72933f7646c6fdba':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-08 17:44:34 -08:00
Joe Malin
4eb44fe66d Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 2011-12-08 17:42:36 -08:00
The Android Automerger
6f41fea465 merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 17:35:27 -08:00
Chia-chi Yeh
87f89d1850 am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 
* commit '46a4e81dbdc9a5f401b5a3c0d26dea2e42b61487':
  VPN: delete the "abort" file before starting VPN daemons.
 2011-12-08 17:24:16 -08:00
Chia-chi Yeh
0c18a10c10 Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 2011-12-08 17:22:16 -08:00
Irfan Sheriff
7e4d6371a7 am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1 
* commit '97ff7893321362020211fae3c5a52b95c3ec19e1':
  Fix wifi bring up at boot up
 2011-12-08 16:01:59 -08:00
Irfan Sheriff
e44371c6f1 Merge "Fix wifi bring up at boot up" into ics-mr1 2011-12-08 15:59:26 -08:00
Jake Hamby
4ca90a0b3c am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 
* commit 'c40f70a5cb1f24a9ea0b5b0cadea75db8fc1cdd3':
  Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
 2011-12-08 15:53:42 -08:00
Jake Hamby
f73a44533e Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 2011-12-08 15:51:33 -08:00
Andreas Huber
2bf2a9874d am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1 
* commit '68f592a8210af27df4339089bbee47fb602cae6a':
  Don't perform RTSP seeks right away but queue them for 200ms
 2011-12-08 13:35:53 -08:00
Andreas Huber
6eb807707f am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 
* commit '0ba9380a337d5e2eae9fd9e4eb8039403ed3815b':
  Fix Bitreader "putBits" implementation, make sure we emulate timestamps
 2011-12-08 13:35:51 -08:00
Andreas Huber
dabd58b008 Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1 2011-12-08 13:33:16 -08:00