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
28a907bd19 am db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'db2b39300a8f763cf2d0c9808deb86db87d5492c':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-20 16:35:20 -08:00
Jean-Baptiste Queru
7f6e9de133 am dde686e2: (-s ours) am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit 'dde686e2bdf7ea679dae4fd4edbf94c71802dc28':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-20 16:32:45 -08:00
Jean-Baptiste Queru
1aecf7be2c am a1e87397: (-s ours) am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 
* commit 'a1e873975704814416ee4d5023bf0740ec195ec0':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
 2012-01-20 16:30:21 -08:00
Jean-Baptiste Queru
f63efc7bde am d6b5584b: (-s ours) am 97aa8ee8: Merge ee4618bc 
* commit 'd6b5584b67f8a2f3d8ea20d748652673d5761e33':
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
 2012-01-20 16:28:04 -08:00
Jean-Baptiste Queru
1db68b3e47 am fd266b36: (-s ours) am 36b48c30: am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" 
* commit 'fd266b36826aa6dd8cd3fa00c159a094423899fb':
  Rename (IF_)LOG() to (IF_)ALOG()
 2012-01-20 16:25:45 -08:00
Justin Ho
32c4388ffa am abc90a7b: (-s ours) am 820b45c0: Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1 
* commit 'abc90a7b48b058379a50a426bd0d2769ac7229b6':
  DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"
 2012-01-20 16:23:03 -08:00
Jeff Brown
fc14b7a857 Merge "Delete dead code." 2012-01-20 16:20:24 -08:00
Wink Saville
50c5167bbc Merge "Additional logging information for Card Application Toolkit/SIM Toolkit" 2012-01-20 15:56:56 -08:00
Robert Ly
2c8fd0dfbe am cdc1ea03: am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1 
* commit 'cdc1ea03130763963fe6c179ed1f5ec14d6c7750':
  cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
 2012-01-20 15:52:32 -08:00
The Android Open Source Project
045b505dc2 am 5d0c713a: Reconcile with ics-mr1-release 
* commit '5d0c713a87e9fd3cc7a775092aef9fc1194c7440':
 2012-01-20 15:52:27 -08:00
Robert Ly
0a1cd6f664 am ab8f1ba0: am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 
* commit 'ab8f1ba0ec9d66db2f653b08f4caa24a27b3a996':
  docs: wifi direct
 2012-01-20 15:52:07 -08:00
Jim Miller
237c720c90 am ab9601cd: am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 
* commit 'ab9601cdbb95ae94088750eff9a926a572c1a4d6':
  Fix 5863053: Add method to lock screen immediately.
 2012-01-20 15:48:21 -08:00
Glenn Kasten
498713533b Merge "Fix warning for redundant typedef" 2012-01-20 15:06:01 -08:00
Robert Greenwalt
81acea1e17 Merge "Stop using shared DUN APN when tethering stops." 2012-01-20 14:35:41 -08:00
Eino-Ville Talvala
39d22241e1 Merge "Add ANativeWindow timestamp support to camera service." 2012-01-20 14:32:22 -08:00
Robert Greenwalt
d1a7460920 Merge "Log netd traffic nicely." 2012-01-20 14:24:15 -08:00
Jeff Brown
b1ea19c09b Merge "Initialize SQLite as part of the android runtime." 2012-01-20 14:07:59 -08:00
Gilles Debunne
43414fbb52 Merge "Touch moves cursor in text refactored" 2012-01-20 14:06:19 -08:00
Andreas Huber
3b03ffe05e Merge "Starhub RTSP apparently does not establish time on all tracks" 2012-01-20 13:43:39 -08:00
Glenn Kasten
8cfd833c3e Merge "Fix typos in string constants" 2012-01-20 12:16:06 -08:00
Glenn Kasten
43e5bc529b Merge "Remove dead file include/media/thread_init.h" 2012-01-20 12:15:38 -08:00
Glenn Kasten
c7a184d946 Merge "Remove redundant get()" 2012-01-20 12:14:32 -08:00
Glenn Kasten
2a216a47eb Merge "Move memcpy_to_i16_from_u8 to audio_utils" 2012-01-20 11:49:04 -08:00
Gilles Debunne
0c62715893 Merge "AOOB in AutoComplete" 2012-01-20 10:27:10 -08:00
Gilles Debunne
9341357e77 Merge "Make sure text selection always starts" 2012-01-20 10:27:00 -08:00
Glenn Kasten
094cf42111 Merge "Remove dead setRingerMode(mode, mask)" 2012-01-20 10:07:06 -08:00
Glenn Kasten
64dc252ee4 Merge "Fix build warning for void * arithmetic" 2012-01-20 08:32:45 -08:00
Pin Ting
72982710df Merge "Fixes some javadoc." 2012-01-20 01:37:12 -08:00
Jeff Brown
3e43730c22 Merge "Don't need to link to libsqlite from media JNI library." 2012-01-19 19:54:16 -08:00
Jeff Brown
eaec3d7bae Merge "Clean up SQLiteDebug natives." 2012-01-19 19:54:05 -08:00
Jeff Brown
0a2df4995f Merge "Remove custom SQLITE_UNCLOSED error code." 2012-01-19 19:53:38 -08:00
James Dong
7e16e907dd Merge "Remove obsolete TODO comments" 2012-01-19 18:53:27 -08:00
Romain Guy
9e9942918b Merge "Fix build" 2012-01-19 18:16:11 -08:00
Romain Guy
2e47bf1e49 Merge "Remove unused code" 2012-01-19 17:42:10 -08:00
Romain Guy
644a23677d Merge "Deprecate unused APIs" 2012-01-19 17:34:26 -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
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
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
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