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

42976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
2f6bc1c106 am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" 
* commit 'c3c36b4fe5863c8ac0ea5470be633e8fade9c483':
  Rename LOG_ASSERT to ALOG_ASSERT
 2012-01-19 17:28:34 -08:00
Jean-Baptiste Queru
64efe6e47a am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '12b7da69957ef894ce5134989e38479c64308ea1':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-19 17:28:30 -08:00
Jean-Baptiste Queru
1f7552fadf am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'f3f650db96d40014a0203393c585c368b0dd7a9a':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-19 17:28:26 -08:00
Jean-Baptiste Queru
d3ed2f2e33 am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit '08d3c6e5ba5c3e5fcc386b07efa709325d45b9ff':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-19 17:28:22 -08:00
Jean-Baptiste Queru
9cb49d5854 am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 
* commit '7ae84204c14b4abff70fcc19c3c33de2591df34b':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
 2012-01-19 17:28:18 -08:00
Jean-Baptiste Queru
364cc01b24 am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" 
* commit '9d25b82d280c2d979d500e7da4447148f32f820b':
  Rename LOG_ASSERT to ALOG_ASSERT
 2012-01-19 17:26:16 -08:00
Jean-Baptiste Queru
1d151e1aba am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-19 17:26:12 -08:00
Jean-Baptiste Queru
29964df372 am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-19 17:26:08 -08:00
Jean-Baptiste Queru
381857ed67 am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-19 17:26:03 -08:00
Jean-Baptiste Queru
1d99080434 am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 
* commit 'ba7f0d2a03643ce429421b81febf18fd50473070':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
 2012-01-19 17:25:58 -08:00
Jean-Baptiste Queru
fa73dc2e69 am 97aa8ee8: Merge ee4618bc 
* commit '97aa8ee81198234aedffceaf71ad216b96323393':
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
 2012-01-19 17:20:58 -08:00
Jean-Baptiste Queru
0190e4d0b1 Merge ee4618bc 
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
 2012-01-19 17:18:25 -08:00
Jean-Baptiste Queru
949cbfce8c am 36b48c30: am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" 
* commit '36b48c30adf7236b00eccf87f3b5691359526540':
  Rename (IF_)LOG() to (IF_)ALOG()
 2012-01-19 17:02:27 -08:00
Jean-Baptiste Queru
88c42cf13b am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" 
* commit 'c318bbb05e02a0080e129623ec8029d31be0d60e':
  Rename (IF_)LOG() to (IF_)ALOG()
 2012-01-19 16:59:41 -08:00
The Android Automerger
7f7c63fcee merge in ics-mr1-release history after reset to ics-mr1 2012-01-19 16:28:56 -08:00
Justin Ho
135dcb7b5f am 820b45c0: Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1 
* commit '820b45c0a21980a43532b9fb9823f8aa08c64a15':
  DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"
 2012-01-19 15:44:53 -08:00
Justin Ho
f0153a3004 Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1 2012-01-19 15:43:19 -08:00
Jean-Baptiste Queru
f2e6108eda Merge "Rename LOG_ASSERT to ALOG_ASSERT" 2012-01-19 14:47:35 -08:00
Jean-Baptiste Queru
82a0641f49 Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 2012-01-19 14:47:22 -08:00
Jean-Baptiste Queru
86c9a50ef8 Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 2012-01-19 14:47:09 -08:00
Jean-Baptiste Queru
837796e964 Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 2012-01-19 14:46:54 -08:00
Jean-Baptiste Queru
04b2818730 Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 2012-01-19 14:46:40 -08:00
Jean-Baptiste Queru
49c36b18b3 Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)" 2012-01-19 14:46:24 -08:00
Steve Block
dcc70319ef Rename LOG_ASSERT to ALOG_ASSERT 
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
 2012-01-19 14:45:08 -08:00
Steve Block
11862d62b3 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) 
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
 2012-01-19 14:45:03 -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