ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
41,493 Commits 2 Branches 0 Tags 54 MiB
adae87846c
Commit Graph

41493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
adae87846c Merge "stagefright aacenc: Add const declarations to some pointers" 2012-02-24 08:53:25 -08:00
Jean-Baptiste Queru
026b1b26e5 Merge "stagefright aacenc: Fix inline asm" 2012-02-24 08:38:23 -08:00
Jean-Baptiste Queru
63f2b75928 Merge "stagefright aacenc: Fix inline asm constraints" 2012-02-24 07:39:03 -08:00
Jean-Baptiste Queru
0025dd37f5 Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 2012-02-23 12:38:14 -08:00
Jean-Baptiste Queru
7cf89f1e78 Merge "Add stubs for improved compatibility" 2012-02-22 12:22:07 -08:00
Jean-Baptiste Queru
7e7e13303d Merge "Xcode 4.3 compatibility checkin" 2012-02-22 09:54:40 -08:00
Jean-Baptiste Queru
66979ec297 Merge "The bigger touch slop still has a problem" 2012-02-22 09:10:43 -08:00
Jean-Baptiste Queru
24ef414133 Merge "Call onTimeChanged when AM/PM changed." 2012-02-21 07:21:53 -08:00
Al Sutton
579c2b4dc1 Xcode 4.3 compatibility checkin 
The update compiler in Xcode 4.3 (and 4.4) requires lookups into dependant
bases of class templates to be qualified. This checkin fixes the issues
raised by the compiler by implementing the this-> recommendation from
the llvm page at http://clang.llvm.org/compatibility.html#dep_lookup_bases

Signed-off-by: Al Sutton <al@funkyandroid.com>
 2012-02-19 08:31:19 +00:00
Jean-Baptiste Queru
125c4b9a95 Merge "Return error code when composing PDU fails" 2012-02-17 11:36:52 -08:00
Jean-Baptiste Queru
651fdee192 Merge "Add support for bmp and wav content types in MMS" 2012-02-17 11:03:35 -08:00
Jean-Baptiste Queru
3429dad456 Merge "Increase PDU parts buffer size for performance reasons" 2012-02-17 09:53:29 -08:00
Jean-Baptiste Queru
5e9fd0734f Merge "Fix incorrect prototype for JNI call" 2012-02-13 14:32:33 -08:00
Jean-Baptiste Queru
6ce7188266 Merge "Skia API changes as a result of an update to the Skia library." 2012-02-06 14:01:06 -08:00
Jean-Baptiste Queru
2bc69de766 Merge "Wi-Fi: Handle disconnect in middle of DHCP operation" 2012-01-27 13:36:49 -08:00
Jean-Baptiste Queru
a8ed1d4f9a Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 2012-01-25 09:17:46 -08:00
Jean-Baptiste Queru
afcc5fa9df Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 2012-01-24 14:26:32 -08:00
Jean-Baptiste Queru
86391d8791 Merge "stagefright aacenc: Add missing newlines at the end of files" 2012-01-24 10:34:25 -08:00
Jean-Baptiste Queru
e5fb848d1f Merge "stagefright aacenc: Properly terminate a comment" 2012-01-24 07:51:12 -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
Steve Block
00469f1940 Rename (IF_)LOG() to (IF_)ALOG() 
Change-Id: If49c81a2793182771c6160fbca93905daa6f44c1
 2012-01-18 11:08:20 +00:00
Jean-Baptiste Queru
dcee50eeef Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 2012-01-13 07:48:56 -08:00
The Android Open Source Project
7e97651fe3 Reconcile with ics-mr1-release 
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
 2011-12-16 08:08:07 -08:00
Dirk Dougherty
480be20aba am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview. 
* commit '8b6ed2d17d5e7e47944026679c9cba66611ab27f':
  Doc change: edits to ICS MR1 API Overview.
 2011-12-16 00:25:06 -08:00
Joe Fernandez
2ee51878fe am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '5b18c714bbff269d7db880b42de34fd1385da9f9':
  docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 23:12:57 -08:00
Joe Fernandez
155e09d518 Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 23:11:26 -08:00
Fred Chung
78bd4d50f0 am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '14633f1b1eea585cdc094ebae75708db2293fe56':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:35:10 -08:00
Fred Chung
3aa6cccff1 am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '48e0617b9e7d06da803c572d6584d68898733d37':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:33:31 -08:00
Scott Main
e10fada930 am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '8e980c1e4e86cb4c7ea679eba3cc01d64e323b26':
  docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 22:14:48 -08:00
Scott Main
7f3a146b9d Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 22:12:53 -08:00
Scott Main
7d6b89e7e1 am 36c67785: docs: update homepage for 4.0.3 announcment 
* commit '36c677855c0a54ede9e92aa856cb2250960e922e':
  docs: update homepage for 4.0.3 announcment
 2011-12-15 22:09:46 -08:00
The Android Automerger
73ce026418 merge in ics-mr1-release history after reset to ics-mr1 2011-12-15 20:50:02 -08:00
Scott Main
e3f5721dc7 am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit '4cb7d0953534587ba2051c6536fdde4b2c9539d5':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:22:39 -08:00
Scott Main
c3df4ee009 am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit '98af5edc70b0b418366f5197b9aeef30f135d40e':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:19:55 -08:00
Scott Main
4e7c034df0 am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 
* commit '8f266b9e348ba69d953568624b8d0e2cea07f99d':
  docs: add remembering users class to nav
 2011-12-15 19:59:25 -08:00
Scott Main
d8f66098f8 am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 
* commit 'd9bc2d21c55e58f83e4209749cc51f0da9869b54':
  docs: add remembering users class to nav
 2011-12-15 19:56:47 -08:00
Scott Main
b6f7ffd6ad Merge "docs: add remembering users class to nav" into ics-mr0 2011-12-15 19:55:25 -08:00
Scott Main
63752fc830 am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 
* commit '26e461b34f5f9eef79aa30f1304cca4262ff88ed':
  Doc merge from master:Training class on Identifying and Authenticating Users.
 2011-12-15 19:55:00 -08:00