ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
42,705 Commits 2 Branches 0 Tags 54 MiB
1f3c500feb
Commit Graph

42705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Block
a5288870d4 Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" 2012-01-10 14:08:32 -08:00
Scott Main
5b630b8b9a am 5a3e67c7: am d1186cd5: Merge "docs: fix broken links in .jd docs" into ics-mr1 
* commit '5a3e67c7811d4a7906548e113561cd1e901de9e2':
  docs: fix broken links in .jd docs
 2012-01-10 12:58:03 -08:00
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
0b0a5dc8aa am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 
* commit 'd3872f55045b7ce7be7dd7ae5fff37d7988bdcb2':
  Fix 4560303: Add setting to lock later when power button pressed
 2012-01-10 10:34:51 -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
fc86e54538 am 06e617f5: am 497661d3: Merge "Fixes typo." into ics-mr1 
* commit '06e617f5a6f68ca99118268eb7361bb1e5ade0a5':
  Fixes typo.
 2012-01-09 19:03:07 -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
9a15c67558 am d476c8b8: am d3be0a76: Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1 
* commit 'd476c8b8a8a6fadea7e72426d3e93c4e6b00e543':
  Unhide Resources APIs for getting resources at specific densities.
 2012-01-09 16:51:52 -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
40254b786a am ab6ccca0: am 64140a07: Fix Music import for Turkish locales. 
* commit 'ab6ccca0d3498e0732c82c867fd2867c5d006783':
  Fix Music import for Turkish locales.
 2012-01-09 16:37:38 -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
Mangesh Ghiware
f61b447509 Merge "Fix issue with site-specific display density getting stuck." 2012-01-09 16:02:21 -08:00
Adam Powell
be6b53cd60 Merge "Fix a bug where window progress bars had the wrong default visibility on windows with action bars." 2012-01-09 15:55:55 -08:00
Steve Block
6726347e89 Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE 
See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
 2012-01-09 21:36:22 +00:00
Glenn Kasten
375adfb954 Merge "Fix race conditions related to ringer mode" 2012-01-09 12:01:37 -08:00
Glenn Kasten
c1f592659b Merge "By convention const goes before the type specifier" 2012-01-09 11:59:17 -08:00
Fabrice Di Meglio
eca0b5c1a2 Merge "Add textDirection="locale"" 2012-01-09 10:46:03 -08:00
Ben Murdoch
24f0b4e7d0 Merge "Prompt the user to terminate unresponsive pages." 2012-01-09 10:41:45 -08:00
Glenn Kasten
d31358297b Merge "Replace loop by __builtin_ctz" 2012-01-09 10:25:00 -08:00
Glenn Kasten
d6ac7baa10 Merge "Clean up AudioTrack::mActive and stopped()" 2012-01-09 10:24:40 -08:00
Glenn Kasten
4eeef91a5b Merge "suspended() and isSuspended() are const" 2012-01-09 10:24:09 -08:00
Steve Block
b72fc3d9ac Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE" 2012-01-09 10:13:41 -08:00
Steve Block
e6f43ddce7 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
 2012-01-08 13:19:13 +00:00
Wink Saville
50d76ddfb0 Merge "Add use of net.tethering.noprovisioning to fetchDunApn" 2012-01-06 23:43:37 -08:00
The Android Open Source Project
f344925464 am 20090b30: Reconcile with ics-mr1-release 
* commit '20090b30340f9382a2eca6a9bed21117f7a27d7e':
 2012-01-06 18:18:36 -08:00
The Android Open Source Project
82f71fb38b Reconcile with ics-mr1-release 
Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c
 2012-01-06 18:15:14 -08:00
Marco Nelissen
b9175095e8 Merge "New UX calls for dialogs without titles." 2012-01-06 16:40:02 -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
John Reck
6802be192b Merge "Update WebSettings.PREVIOUS_VERSION" 2012-01-06 16:03:59 -08:00
Eino-Ville Talvala
7f52e90aea am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 
* commit '4bc873e6ff73200af866f8c9efca66ad8ed23682':
  Switch camera sounds to always use the system enforced audio stream.
 2012-01-06 15:51:44 -08:00
Bart Sears
79efd563cc am c2eaee53: (-s ours) am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1 
* commit 'c2eaee533fe25cd9a0781f349e9c8c7ef02bd648':
  getDuration can be only called after prepared. DO NOT MERGE
 2012-01-06 15:49:26 -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
Nick Kralevich
087876ffa4 Merge "Don't allow reading of packagelist files." 2012-01-06 14:50:53 -08:00
Dan Morrill
2a9afd1fa4 Merge "Minor tweak to console output." 2012-01-06 14:39:11 -08:00
Wink Saville
52f11b6d4a am f817e941: am 2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1 
* commit 'f817e9413356de2a303e14709e67457190e976c9':
  Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
 2012-01-06 14:32:37 -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
b56f002ee2 am 42e231bf: (-s ours) 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 '42e231bf4a9995c334fa134aa21f859fa1f719fc':
  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:23:29 -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
1537df7484 am bc72272c: am beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1 
* commit 'bc72272cc07398a5dd6d7c76fb3eac91ad3e2bd8':
  Fixing crash when taking screenshot over secure window.
 2012-01-06 14:13:47 -08:00
Justin Ho
e96e8ff793 am 7db47a42: am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1 
* commit '7db47a42f1211befb015a7a9640f0c447b477228':
  Updating default image wallpaper for tablet.
 2012-01-06 14:13:38 -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