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

35920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
59bd95238c am a4644307: (-s ours) am df1734e3: Fix lease duration handling 
* commit 'a464430762bad8039a598ce9af71f962d01f8eba':
  Fix lease duration handling
 2011-06-15 16:35:20 -07:00
Irfan Sheriff
9dfdb876ef am df1734e3: Fix lease duration handling 
* commit 'df1734e3f57646df1fa96275cbb65bb91ac9d2ac':
  Fix lease duration handling
 2011-06-15 16:29:02 -07:00
Xavier Ducrohet
01e8bf87c4 Merge "Fix changed native method delegates in layoutlib for ICS." 2011-06-15 15:46:30 -07:00
The Android Open Source Project
ab8ca0c54b Reconcile with gingerbread-release 
Change-Id: I500f9a10cdfb891919b1e5618a42330ba00fcfb6
 2011-06-15 15:09:49 -07:00
Justin Ho
1579c7604d am 40fc6e0d: am c407ef22: am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2 
* commit '40fc6e0de578198c9cc5d9a493cb7db77bc938b8':
  Updated art for compat mode dialog.
 2011-06-15 15:01:42 -07:00
Justin Ho
e76cf98569 am c407ef22: am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2 
* commit 'c407ef22222f8f7e6f82abd081ecb65149336f99':
  Updated art for compat mode dialog.
 2011-06-15 14:58:56 -07:00
Justin Ho
92ecd9e25d am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2 
* commit 'f409604122f959653fb789e9133e94a51e369693':
  Updated art for compat mode dialog.
 2011-06-15 14:56:03 -07:00
Justin Ho
d502ddadca Merge "Updated art for compat mode dialog." into honeycomb-mr2 2011-06-15 14:52:52 -07:00
Wink Saville
dfc4388bb4 am ec18268e: am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE 
* commit 'ec18268eb42641cd2a6ae9c8b26e35d67bb41021':
  Always clear settings when entering Inactive state.
 2011-06-15 14:37:00 -07:00
Wink Saville
ccbde1e01f am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE 
* commit '1146bddf92fc91dad384bdaea740f9472bebd911':
  Always clear settings when entering Inactive state.
 2011-06-15 14:34:08 -07:00
Wink Saville
4e89c63709 Merge "Always clear settings when entering Inactive state." into honeycomb-LTE 2011-06-15 14:31:16 -07:00
Jean-Baptiste Queru
0c51cd123f am edfdef92: Merge 5137711109783dcbb20143d3e5cab2fa931218dd 
* commit 'edfdef926e4ddd123c9112e97605ff8d97ba9fad':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-15 14:28:50 -07:00
Jean-Baptiste Queru
3d4adb262d Merge 5137711109783dcbb20143d3e5cab2fa931218dd 
Change-Id: I5046a54648bdeea6f9661c46329d7b502f2f52b9
 2011-06-15 14:25:47 -07:00
Mathias Agopian
35cc0fcd51 am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit 'afffa8fa9f82a7343e1158bf921931fd3e3df615':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-15 14:13:04 -07:00
Irfan Sheriff
d0c5cf18d7 am 11954872: am 5af3405f: am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2 
* commit '1195487228e1eb6c8859368286168051bd505b2f':
  Fix lease duration handling
 2011-06-15 14:10:51 -07:00
Irfan Sheriff
c00630b2c0 am 5af3405f: am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2 
* commit '5af3405f0d24c853bd10eb239c081e31972d3e1d':
  Fix lease duration handling
 2011-06-15 14:07:54 -07:00
Irfan Sheriff
a260990eae am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2 
* commit 'ecda5461603b6de77beb045dfdf82dad7ae48d61':
  Fix lease duration handling
 2011-06-15 14:04:23 -07:00
Wink Saville
53a973ba9e am aff9ec70: am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE 
* commit 'aff9ec70e22abb64149e335ae2eb519c6027eb4a':
  Clean up some debug statements.
 2011-06-15 14:03:31 -07:00
Dianne Hackborn
b743c2b0cf am 27f889d0: am 3dc1b5e2: am ed31bbf6: Clean up some edge cases in the compat mode UI: 
* commit '27f889d07ced48fbc7fa61c41a4a32ec3e1a95f3':
  Clean up some edge cases in the compat mode UI:
 2011-06-15 14:00:29 -07:00
Irfan Sheriff
1e765667fb Merge "Fix lease duration handling" into honeycomb-mr2 2011-06-15 14:00:23 -07:00
Wink Saville
0be468aa07 am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE 
* commit '4d6233b2edd24c83efe10f4403456b8d0c87241a':
  Clean up some debug statements.
 2011-06-15 13:58:20 -07:00
Wink Saville
30d59b323d Merge "Clean up some debug statements." into honeycomb-LTE 2011-06-15 13:55:06 -07:00
Marco Nelissen
e19dcfa979 am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp 
* commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6':
  Ignore duplicate WAP push PDU source/destination port if configured
 2011-06-15 13:44:56 -07:00
Dianne Hackborn
1b09a3c82b am 3dc1b5e2: am ed31bbf6: Clean up some edge cases in the compat mode UI: 
* commit '3dc1b5e26fac2c6a6161d617f99fd901ee2ffc9e':
  Clean up some edge cases in the compat mode UI:
 2011-06-15 13:44:16 -07:00
Martijn Coenen
eb78b029ef Merge "Added vcard query parameter for not attaching photo." 2011-06-15 13:31:53 -07:00
Jamie Gennis
07ed1a94bc SurfaceTexture: enable a test that now passes. 
This change enables the QueryFormatAfterSettingWorks.

Change-Id: Ic868011a36a6c86c8646880246cd5b6960a13364
 2011-06-15 12:44:01 -07:00
Jamie Gennis
d05bb2ed4c SurfaceTexture: enable a test that is now passing. 
This change enables the TexturingFromCpuFilledYV12BufferPow2 test.

Change-Id: Ib356ee3d2f8979f34f849fd4090f598295e2e92e
 2011-06-15 12:44:01 -07:00
Dianne Hackborn
895ca5888d am ed31bbf6: Clean up some edge cases in the compat mode UI: 
* commit 'ed31bbf65267c1f383dd0dff37acd034f3b9b59f':
  Clean up some edge cases in the compat mode UI:
 2011-06-15 12:35:57 -07:00
Marco Nelissen
59ee48942b am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp 
* commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
  Ignore duplicate WAP push PDU source/destination port if configured
 2011-06-15 12:20:57 -07:00
Chia-chi Yeh
0ef197ff75 Merge "VPN: change some strings in VPN notifications." 2011-06-15 11:31:34 -07:00
Jeff Sharkey
82c0238a36 Merge "Fix NetworkPolicy tests after notifications." 2011-06-15 11:02:26 -07:00
Debashish Chatterjee
dcb2aa8b25 Merge "Modified Voicemail.SOURCE_DATA value to match with the constant name." 2011-06-15 10:45:03 -07:00
Jeff Sharkey
593ba066d7 Merge "Include template in data warning/limit intents." 2011-06-15 10:36:22 -07:00
Fabrice Di Meglio
66e3f232eb Merge "Fix Gravity start/end" 2011-06-15 10:34:09 -07:00
Elliott Hughes
858d7db171 Merge "de_DE "Mai" isn't an abbreviation." 2011-06-15 10:24:29 -07:00
Daniel Sandler
235ead9633 Merge "Swipe to veto in notifications." 2011-06-15 10:21:44 -07:00
Gilles Debunne
8160090634 Merge "Bug 4579629. Send before and after text when suggestion is picked." 2011-06-15 09:46:55 -07:00
John Reck
e8320bd4f1 Merge "Support for getting the background color" 2011-06-15 09:12:14 -07:00
Marco Nelissen
dd729fc173 resolved conflicts for merge of d027329c to gingerbread-plus-aosp 
Change-Id: I169c415bf998b9935ab36812511573db05717b91
 2011-06-15 08:58:38 -07:00
Daniel Sandler
f831132bb2 am 2897fc4c: am fbb09347: am 5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2 
* commit '2897fc4cc320d9fea2c6a81d7e2b05b6b820acf0':
  One-time-only compatibility mode explanation dialog.
 2011-06-15 06:36:56 -07:00
Daniel Sandler
4fc8017fa7 am d163a616: am 2fdf5880: am 97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2 
* commit 'd163a6162891f0e14d4536460d839262d2693e9a':
  Final UI for compatibility mode.
 2011-06-15 06:36:35 -07:00
Daniel Sandler
a6b1dd29b5 am fbb09347: am 5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2 
* commit 'fbb093479362865da833b89643a8f58347278bc3':
  One-time-only compatibility mode explanation dialog.
 2011-06-15 06:25:35 -07:00
Daniel Sandler
ef6841611a am 2fdf5880: am 97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2 
* commit '2fdf5880611c333e172d4e0cc2c4259bca324699':
  Final UI for compatibility mode.
 2011-06-15 06:25:24 -07:00
Daniel Sandler
c60919e7a3 am 5994bff9: Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2 
* commit '5994bff92472b3bdcd5754d8a9156b49269a9c1d':
  One-time-only compatibility mode explanation dialog.
 2011-06-15 06:15:11 -07:00
Daniel Sandler
96ee0cbcc8 am 97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2 
* commit '97d5081ac331884fe0f6f2e5814d4862a974fbe3':
  Final UI for compatibility mode.
 2011-06-15 06:15:07 -07:00
Daniel Sandler
474a302d5a Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2 2011-06-15 06:10:32 -07:00
Daniel Sandler
75566f4bf5 Merge "Final UI for compatibility mode." into honeycomb-mr2 2011-06-15 06:10:27 -07:00
Narayan Kamath
77ae8db510 Merge "Fix a bug in TextToSpeech." 2011-06-15 05:43:34 -07:00
Hung-ying Tyan
887dc8ed6b Merge "Move WakeupTimer out of SipService." 2011-06-15 03:17:50 -07:00
Adam Powell
9316ba2b58 Merge "Make FastScroller behave kinder and gentler when an app decides to return null from SectionIndexer#getSections()" 2011-06-14 22:11:26 -07:00