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

41532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
fca2839770 am d1186cd5: Merge "docs: fix broken links in .jd docs" into ics-mr1 
* commit 'd1186cd5bb445e9b0768edf6cb87022865cada55':
  docs: fix broken links in .jd docs
 2012-01-10 12:55:36 -08:00
Scott Main
5fbad363f1 Merge "docs: fix broken links in .jd docs" into ics-mr1 2012-01-10 12:53:42 -08:00
Jim Miller
e597102c47 am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 
* commit '62fad7689567bed6ec372401c1b171659c28572d':
  Fix 4560303: Add setting to lock later when power button pressed
 2012-01-10 10:30:41 -08:00
Jim Miller
2f6fcb2893 Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 2012-01-10 10:28:21 -08:00
Pin Ting
e846922266 am 497661d3: Merge "Fixes typo." into ics-mr1 
* commit '497661d309ea960aa9723ef4e0d064b56515b566':
  Fixes typo.
 2012-01-09 19:00:16 -08:00
Pin Ting
98f6fa54ac Merge "Fixes typo." into ics-mr1 2012-01-09 18:58:13 -08:00
Dianne Hackborn
198d540688 am d3be0a76: Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1 
* commit 'd3be0a76e46584357dbb77fcd200128d0d7dc9a8':
  Unhide Resources APIs for getting resources at specific densities.
 2012-01-09 16:49:02 -08:00
Dianne Hackborn
ee9e2be00e Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1 2012-01-09 16:47:35 -08:00
Elliott Hughes
e366055db4 am 64140a07: Fix Music import for Turkish locales. 
* commit '64140a0770f98b56993a96289ec3143e89194265':
  Fix Music import for Turkish locales.
 2012-01-09 16:12:32 -08:00
The Android Open Source Project
82f71fb38b Reconcile with ics-mr1-release 
Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c
 2012-01-06 18:15:14 -08:00
The Android Automerger
5b03a1a835 merge in ics-mr1-release history after reset to ics-mr1 2012-01-06 16:32:11 -08:00
Eino-Ville Talvala
0981b259c7 am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 
* commit '7944704e6c4cc10105838b78d3d8403bf66a066b':
  Switch camera sounds to always use the system enforced audio stream.
 2012-01-06 15:49:17 -08:00
Bart Sears
fd76796d29 am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1 
* commit 'a476eed6b291d06f5e571597b928b7b2f0b3f257':
  getDuration can be only called after prepared. DO NOT MERGE
 2012-01-06 15:47:04 -08:00
Eino-Ville Talvala
456a9c2dc5 Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 2012-01-06 15:46:36 -08:00
Bart Sears
4dc1cbe06f Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1 2012-01-06 15:45:13 -08:00
Wink Saville
5d98eb7e1b am 2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1 
* commit '2f143a966ccfec71de2c3a9785f5f3f47d418acb':
  Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
 2012-01-06 14:30:20 -08:00
Wink Saville
8676933648 Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1 2012-01-06 14:27:56 -08:00
Fabrice Di Meglio
5fb50802d3 am c1d03cff: Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1 
* commit 'c1d03cff271d81fc9948648583e9e07c0c624dc1':
  Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
 2012-01-06 14:20:41 -08:00
Fabrice Di Meglio
9735559b6d Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1 2012-01-06 14:19:20 -08:00
Justin Ho
67ad74d334 am beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1 
* commit 'beb8be60d157e4812e0195c2e445aa0abb82d9a2':
  Fixing crash when taking screenshot over secure window.
 2012-01-06 14:10:01 -08:00
Justin Ho
a87c42e2c4 am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1 
* commit '3116b7a7ca6681daabbdac55e71203995e7a7afe':
  Updating default image wallpaper for tablet.
 2012-01-06 14:09:59 -08:00
Justin Ho
52b68583c8 Merge "Fixing crash when taking screenshot over secure window." into ics-mr1 2012-01-06 14:07:51 -08:00
Justin Ho
2e296aeed7 Merge "Updating default image wallpaper for tablet." into ics-mr1 2012-01-06 14:07:37 -08:00
Scott Main
b34baf5f6a am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* commit 'dacbf67ab915fa8b987f6fb9f044160af92652cd':
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 09:45:19 -08:00
Scott Main
55ec71116f Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* changes:
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 09:42:52 -08:00
The Android Open Source Project
ddf6c13a12 Reconcile with ics-mr1-release 
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
 2012-01-05 07:45:28 -08:00
The Android Automerger
31815b4f39 merge in ics-mr1-release history after reset to ics-mr1 2012-01-04 16:42:23 -08:00
Wink Saville
42fdc6f3e3 am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1 
* commit 'c697ebfdd671c7f4cf338d601917de16d2f1f135':
  Enhancement on ICS data stall polling logic
 2012-01-04 13:55:28 -08:00
Wink Saville
103a6ff9ce Merge "Enhancement on ICS data stall polling logic" into ics-mr1 2012-01-04 13:53:25 -08:00
Wink Saville
0d69bb8a62 am d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 
* commit 'd4d35168129d544f62cee7e1f83c5bf15d9f291d':
  Add support of dislaying Alpha tag for BIP commands
 2012-01-04 13:51:59 -08:00
Wink Saville
4ee6427cc5 Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 2012-01-04 13:50:04 -08:00
Wink Saville
5bdd1e8ccf am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 
* commit 'c97d0e43bacdae735071d6d7026175fbc4bdafca':
  Support suggestedRetryTime in CDMA DCT
 2012-01-04 13:49:37 -08:00
Bart Sears
53cc3c7676 am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 
* commit '705665acda5fec6c8c76683b2e5850b0bd447449':
  Do not allow file:// access when it is disabled. Do not merge.
 2012-01-04 13:49:34 -08:00
Wink Saville
624eef24dc Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 2012-01-04 13:47:55 -08:00
Bart Sears
66577b602c Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 2012-01-04 13:47:09 -08:00
Eric Laurent
2ae141d964 am fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 
* commit 'fb578b6b88af51812b71a86ad4dd3a7de56e394b':
  audioflinger: fix clicks on 48kHz audio.
 2012-01-04 13:00:49 -08:00
Eric Laurent
11cb4c04a3 Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 2012-01-04 12:58:17 -08:00
Scott Main
030270348b am c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url 
* commit 'c8810c2feb53bd423d0ef31bc10d22fc4cbf9c89':
  docs: add Teleepoch VID/driver info and update Huawei url
 2012-01-04 12:01:02 -08:00
Christopher Tate
48d485e150 am 30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1 
* commit '30ad699c0e246ef3889f691361758235ecb89895':
  Tweak docs on 'adb logcat'
 2012-01-03 17:40:53 -08:00
Christopher Tate
1e2efa6270 Merge "Tweak docs on 'adb logcat'" into ics-mr1 2012-01-03 17:38:51 -08:00
Scott Main
ec6532faf3 am 12d9954d: docs: dasboard update for 1/3/12 
* commit '12d9954d198d29da1a15ba2c6947ce91839cbb83':
  docs: dasboard update for 1/3/12
 2012-01-03 15:58:41 -08:00
Dirk Dougherty
c1140c41a5 am a17e100b: Doc change: fix link target for "Publish" icon. 
* commit 'a17e100b7a192cae3935d2ae144fb1a1115a4ca7':
  Doc change: fix link target for "Publish" icon.
 2012-01-03 10:35:18 -08:00
Scott Main
0b59e0cdb5 am 0582da68: docs: add links for Galaxy Nexus driver 
* commit '0582da680ed3d48bfd9d6ed550f39aa2177baf79':
  docs: add links for Galaxy Nexus driver
 2011-12-28 10:34:03 -08:00
Joe Fernandez
c79adf24cb am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1 
* commit 'bb7f590a5a539486de5127071c7ade8ec988d755':
  docs: Add developer guide cross-references, Project ACRE, round 4
 2011-12-22 15:57:09 -08:00
Joe Fernandez
5c907fd862 Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1 2011-12-22 15:55:00 -08:00
Roman Nurik
aac4f449cc am 38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1 
* commit '38ee0dae2cf0ff1860973523e5cda6e38642e904':
  docs: Update App Widgets dev guide size discussion
 2011-12-22 14:29:25 -08:00
Roman Nurik
3cae86d9e1 Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1 2011-12-22 14:27:55 -08:00
The Android Open Source Project
debdcaec3d Reconcile with ics-mr1-release 
Change-Id: Ic9251f762e0356c65eff1798cd5897a502d7981e
 2011-12-21 07:19:20 -08:00
The Android Automerger
100786e8a5 merge in ics-mr1-release history after reset to ics-mr1 2011-12-20 17:27:07 -08:00
The Android Open Source Project
2e2c59f4c6 Reconcile with ics-mr1-release 
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
 2011-12-20 13:08:33 -08:00