ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity
42,952 Commits 2 Branches 0 Tags 54 MiB
28a907bd19
Commit Graph

42952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
49c36b18b3 Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)" 2012-01-19 14:46:24 -08:00
Steve Block
252778f3ef Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) 
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
 2012-01-19 14:44:59 -08:00
Steve Block
5b11920b1a Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) 
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
 2012-01-19 14:44:56 -08:00
Steve Block
a6c2fd5ac1 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) 
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
 2012-01-19 14:44:50 -08:00
Steve Block
1888a81fb7 Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) 
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
 2012-01-19 14:44:31 -08:00
Jean-Baptiste Queru
f98b6fd3f5 Merge "Rename (IF_)LOG() to (IF_)ALOG()" 2012-01-19 14:41:57 -08:00
Andreas Huber
562c9c94ee Merge "Make sure the ThrottledSource reports the proper mime type" 2012-01-19 14:40:44 -08:00
Jeff Brown
42d63bdf47 Merge "Remove no longer needed EventHub usleep() optimization." 2012-01-19 14:19:28 -08:00
Jeff Brown
00e188c986 Merge "Fix line wrapping." 2012-01-19 14:11:47 -08:00
Jeff Brown
4cebd4acb9 Merge "Clean up SQLite debugging code." 2012-01-19 14:05:39 -08:00
Robert Ly
d53f6430b0 am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1 
* commit '4e552533ea049970b54c1cdba5afb7d13496c3c1':
  cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
 2012-01-19 13:32:51 -08:00
Robert Ly
75a4189c2e resolved conflicts for merge of b078d942 to ics-mr1 
Change-Id: I831c06f2c198cc8825788a05770397457e8d511c
 2012-01-19 13:25:07 -08:00
Xavier Ducrohet
3e71b25e6e Merge "Fix broken drawCircle LayoutLib." 2012-01-19 13:17:43 -08:00
The Android Open Source Project
06449fbbb8 Reconcile with ics-mr1-release 
Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b
 2012-01-19 13:06:50 -08:00
Eric Laurent
67398176f1 Merge "resolved conflicts for merge of 05683c85 to master" 2012-01-19 10:52:46 -08:00
Robert Ly
52bd79fb14 am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 
* commit '12310ee801553e63091ce3bda6f07a5be31a473c':
  docs: wifi direct
 2012-01-19 10:43:45 -08:00
Robert Ly
90bb222c3e am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 
* commit '9575a1ab5d033248284d59b2a2ae6eda80f79762':
  docs: wifi direct
 2012-01-19 10:41:28 -08:00
Robert Ly
75991b50d8 Merge "docs: wifi direct" into ics-mr0 2012-01-19 10:38:51 -08:00
Gilles Debunne
273b8d5c12 Merge "Touch slop added to double tap detection" 2012-01-19 10:23:32 -08:00
Gilles Debunne
b77ca4509a Merge "Fixes around extract mode" 2012-01-19 10:23:18 -08:00
Teng-Hui Zhu
0fa934f97a Merge "Support full screen back to back playing using javascript" 2012-01-19 10:00:40 -08:00
Eric Laurent
b64e824cd2 resolved conflicts for merge of 05683c85 to master 
Change-Id: I7846b7da8c5813b7a9b1f3f71aede0229689ff0d
 2012-01-19 10:00:02 -08:00
Glenn Kasten
341cf006a3 Merge "Fix incorrect includes of AudioTrack.h" 2012-01-19 06:10:37 -08:00
Glenn Kasten
01d2a7ffaa Merge "Simplify range check for audio_mode_t (continued)" 2012-01-19 06:09:20 -08:00
Glenn Kasten
00e560c1ef Merge "Add units to time periods" 2012-01-19 06:09:05 -08:00
Glenn Kasten
8392e1af2c Merge "Use const const strings for arrays and pointers to strings" 2012-01-19 06:08:53 -08:00
Glenn Kasten
23506b664a Merge "For booleans, use ! instead of == false" 2012-01-19 06:08:40 -08:00
Glenn Kasten
fb06f08c0a Merge "Replace run-time stream types by compile-time" 2012-01-19 06:08:12 -08:00
The Android Automerger
73ca18b8f2 merge in ics-mr1-release history after reset to ics-mr1 2012-01-18 21:17:55 -08:00
Jeff Brown
81e215f3df Merge "Fix issues with reentrant SQLite triggers." 2012-01-18 18:31:06 -08:00
Romain Guy
f1c2f9a22a Merge "Add basic code required for drawPicture()" 2012-01-18 18:14:27 -08:00
Romain Guy
3ed5198bf0 Merge "Don't crash on Canvas.drawPicture()" 2012-01-18 18:11:09 -08:00
Romain Guy
6c05083234 Merge "Full support for Canvas.drawPosText" 2012-01-18 18:01:34 -08:00
Jim Miller
8962170b2a am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 
* commit '230a709285abc5dfd92f05d91a8997d52a59d3c7':
  Fix 5863053: Add method to lock screen immediately.
 2012-01-18 16:46:12 -08:00
Jim Miller
b82dd313e7 Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 2012-01-18 16:44:52 -08:00
Eric Laurent
bf927a024b am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1 
* commit 'db2e71635968f455ad4f41b2e24fb8b909c24ca0':
  AudioFlinger: mix track only when really ready (2)
 2012-01-18 16:08:06 -08:00
Wink Saville
78b9b6f6c6 am 7b6231a4: am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 
* commit '7b6231a44e21fbf5b2bc2a5eff2231139ac4088f':
  Use new preferredAPN URI avoiding onApnChanged() call with self-change
 2012-01-18 16:08:04 -08:00
Christopher Tate
033c95cdba Merge "Fix edge cases leading to backup hanging forever" 2012-01-18 16:07:28 -08:00
Wink Saville
0f467dcc93 am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 
* commit 'aba798510129327a046d57844381382fb1faa3ba':
  Use new preferredAPN URI avoiding onApnChanged() call with self-change
 2012-01-18 16:05:43 -08:00
Eric Laurent
3571f22afd Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1 2012-01-18 16:05:31 -08:00
Wink Saville
9b4e98aa15 Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 2012-01-18 16:03:24 -08:00
Stephen Hines
f724170dc5 Merge "Run ComputePerf multiple times." 2012-01-18 15:42:46 -08:00
Adam Powell
947a9a0fd5 am a6a0d134: am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1 
* commit 'a6a0d134ebfb0931473c5e54f21ff543e08b4a91':
  Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
 2012-01-18 14:51:35 -08:00
Adam Powell
589629d2de am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1 
* commit '04f3848986efda8cf006f575d2e4990f120a1bc8':
  Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
 2012-01-18 14:49:30 -08:00
Adam Powell
9d40d1e8d0 Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1 2012-01-18 14:47:20 -08:00
Jeff Brown
8377e5905a Merge "Improve heuristics for orientation detection." 2012-01-18 14:43:16 -08:00
Michael Kolb
b86560dfb1 Merge "Prevent IME from popping up on startup" 2012-01-18 14:00:52 -08:00
Robert Ly
93ddcfd785 am c891c6ef: am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1 
* commit 'c891c6eff7ab320092af4ec5b235f83866f66261':
  docs: adding rs api docs
 2012-01-18 13:21:54 -08:00
Robert Ly
ee537418cf am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 
* commit '43fda84e91b1fe356af35386d2f304d3ab71529e':
  update overview page for rs api docs to open iframe links in parent
 2012-01-18 13:21:51 -08:00
Robert Ly
3d515c3a2e am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1 
* commit '013dbcf0783f55efbb75e6c2794478c27d172c8c':
  docs: adding rs api docs
 2012-01-18 13:19:52 -08:00