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

41640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
0190e4d0b1 Merge ee4618bc 
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
 2012-01-19 17:18:25 -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
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
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
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
The Android Open Source Project
06449fbbb8 Reconcile with ics-mr1-release 
Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b
 2012-01-19 13:06:50 -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
The Android Automerger
73ca18b8f2 merge in ics-mr1-release history after reset to ics-mr1 2012-01-18 21:17:55 -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
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
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
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
Robert Ly
75aa7310ea am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 
* commit '6ad9ea7deb669eca68c58f001c935255c3294cfe':
  update overview page for rs api docs to open iframe links in parent
 2012-01-18 13:19:50 -08:00
Robert Ly
103e20348e Merge "docs: adding rs api docs" into ics-mr1 2012-01-18 13:18:11 -08:00
Robert Ly
140608dd28 Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 2012-01-18 13:17:51 -08:00
Joe Fernandez
629e3a4885 am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 
* commit 'dd41d360eac45ceae92963ed3f100f1c39dd5db2':
  docs: Android API 15 SDK r2 Release Notes
 2012-01-18 12:35:30 -08:00
Joe Fernandez
617d0b0488 Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 2012-01-18 12:33:45 -08:00
Steve Block
00469f1940 Rename (IF_)LOG() to (IF_)ALOG() 
Change-Id: If49c81a2793182771c6160fbca93905daa6f44c1
 2012-01-18 11:08:20 +00:00
Scott Main
2b4332646c am 3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1 
* commit '3938e4fbaae132db9b4676ba26f6b3c042a6879e':
  docs: emphasize qualifier order and mention implicit version qualifer
 2012-01-13 18:25:44 -08:00
Scott Main
37a79cfbec Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1 2012-01-13 18:23:40 -08:00
Scott Main
3d66c69643 am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1 
* commit '40d6e7d913fe865accb8313efdb87aacd6d71f18':
  docs: mention x86 as a native platform filter
 2012-01-13 18:23:35 -08:00
Dianne Hackborn
1f7dba4b26 am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1 
* commit 'cc7bd5ab550855c14c76701709b35d12a9677eb2':
  Update notification documentation to follow current guidelines.
 2012-01-13 18:23:34 -08:00
Daniel Sandler
f176920175 am bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05 
* commit 'bd9d9d3ae2a758139c7dd722c4836a33b9b059a8':
  cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
 2012-01-13 18:23:33 -08:00
Scott Main
3d3293b131 Merge "docs: mention x86 as a native platform filter" into ics-mr1 2012-01-13 18:21:42 -08:00
Dianne Hackborn
55f960feb3 Merge "Update notification documentation to follow current guidelines." into ics-mr1 2012-01-13 16:36:05 -08:00
The Android Automerger
9eb6f85cb5 merge in ics-mr1-release history after reset to ics-mr1 2012-01-13 16:18:17 -08:00
Kenny Root
575f408150 am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1 
* commit '2ddf6ea6dc67043fb9f91df366187c2153c30d30':
  Fix issue with selecting proper JNI libraries
 2012-01-13 13:12:34 -08:00
Kenny Root
f39fc5a881 Merge "Fix issue with selecting proper JNI libraries" into ics-mr1 2012-01-13 13:11:02 -08:00
Dianne Hackborn
3d9e6137a8 am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1 
* commit '2e282f35b009fe4c23daca35592dae2032641643':
  Fix issue #5823276: home repaints after full-screen app is exited
 2012-01-13 12:58:45 -08:00