Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | am ac252357: Merge "Remove atomic-inline.h." | Elliott Hughes | 2014-11-17 | 3 | -21/+2 | |
|\ \ \ | |/ / | ||||||
| * | | Remove atomic-inline.h. | Elliott Hughes | 2014-11-17 | 3 | -21/+2 | |
* | | | am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core." | Elliott Hughes | 2014-11-17 | 2 | -8/+0 | |
|\ \ \ | |/ / | ||||||
| * | | Remove the error-prone TARGET_CPU_SMP from system/core. | Elliott Hughes | 2014-11-17 | 2 | -8/+0 | |
* | | | am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h."" | Hans Boehm | 2014-11-14 | 8 | -1039/+112 | |
|\ \ \ | |/ / | ||||||
| * | | Second attempt to "Rewrite atomic.h to use stdatomic.h." | Hans Boehm | 2014-11-13 | 8 | -1039/+112 | |
* | | | am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP" | Yabin Cui | 2014-11-11 | 1 | -2/+2 | |
|\ \ \ | |/ / | ||||||
| * | | kill HAVE_POSIX_FILEMAP | Yabin Cui | 2014-11-11 | 1 | -2/+2 | |
* | | | am 65a83bdf: Merge "Reserve some AIDs for OEMs" | Nick Kralevich | 2014-11-10 | 1 | -0/+5 | |
|\ \ \ | |/ / | ||||||
| * | | Merge "Reserve some AIDs for OEMs" | Nick Kralevich | 2014-11-10 | 1 | -0/+5 | |
| |\ \ | ||||||
| | * | | Reserve some AIDs for OEMs | Johan Redestig | 2014-11-10 | 1 | -0/+5 | |
* | | | | am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include." | Stephen Hines | 2014-11-09 | 1 | -0/+4 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge "Move winsock2.h in front of a potential windows.h include." | Stephen Hines | 2014-11-09 | 1 | -0/+4 | |
| |\ \ \ | ||||||
| | * | | | Move winsock2.h in front of a potential windows.h include. | Stephen Hines | 2014-11-08 | 1 | -0/+4 | |
| | |/ / | ||||||
* | | | | am aaa920d7: Merge "Make Unicode.h use types that match libc++." | Dan Albert | 2014-11-09 | 1 | -2/+2 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Make Unicode.h use types that match libc++. | Dan Albert | 2014-11-08 | 1 | -2/+2 | |
| |/ / | ||||||
| * | | resolved conflicts for merge of e3c22c41 to stage-aosp-master | Calin Juravle | 2014-10-28 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | Handle code_cache dir creation in libnativebridge | Calin Juravle | 2014-10-27 | 1 | -1/+1 | |
| * | | | am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bod... | Chih-Hung Hsieh | 2014-10-15 | 1 | -39/+11 | |
| |\ \ \ | | |/ / | ||||||
| * | | | am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h."" | Hans Boehm | 2014-10-04 | 8 | -124/+1039 | |
| |\ \ \ | ||||||
| * \ \ \ | am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h." | Hans Boehm | 2014-10-04 | 8 | -1039/+124 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | resolved conflicts for merge of 64884bb1 to lmp-dev-plus-aosp | Andreas Gampe | 2014-09-24 | 1 | -3/+28 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | am f6cce347: audio: add HW hotword capture flag | Eric Laurent | 2014-09-24 | 1 | -3/+5 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(... | Elliott Hughes | 2014-09-23 | 1 | -8/+4 | |
| |\ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ | Merge "Handle code_cache dir creation in libnativebridge" into lmp-mr1-dev | Calin Juravle | 2014-10-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| * | | | | | | | | Handle code_cache dir creation in libnativebridge | Calin Juravle | 2014-10-27 | 1 | -1/+1 | |
* | | | | | | | | | am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bod... | Chih-Hung Hsieh | 2014-10-15 | 1 | -39/+11 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| * | | | | | | | | Do not inline rarely used trace function bodies. | Chih-Hung Hsieh | 2014-10-14 | 1 | -39/+11 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | am 4b0374ae: am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for F... | Carson Liao | 2014-10-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | modified AUDIO_SOURCE_FM_TUNER enum value for FM feature | Carson Liao | 2014-10-06 | 1 | -1/+1 | |
| * | | | | | | | am b3facbfd: LibNativeBridge: Add early init & env setup | jgu21 | 2014-09-29 | 1 | -3/+28 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | LibNativeBridge: Add early init & env setup | jgu21 | 2014-09-26 | 1 | -3/+28 | |
| | | |_|_|/ / / | | |/| | | | | | ||||||
* | | | | | | | | am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h."" | Hans Boehm | 2014-10-04 | 8 | -124/+1039 | |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | Revert "Rewrite atomic.h to use stdatomic.h." | Hans Boehm | 2014-10-04 | 8 | -124/+1039 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h." | Hans Boehm | 2014-10-04 | 8 | -1039/+124 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Rewrite atomic.h to use stdatomic.h. | Hans Boehm | 2014-10-01 | 8 | -1039/+124 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | am fcbb23ad: [AU] Update volume setting and Audio Device API 3.0 | Hochi Huang | 2014-09-26 | 1 | -0/+1 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | [AU] Update volume setting and Audio Device API 3.0 | Hochi Huang | 2014-09-25 | 1 | -0/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | resolved conflicts for merge of 64884bb1 to lmp-mr1-dev-plus-aosp | Andreas Gampe | 2014-09-24 | 1 | -3/+28 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge "LibNativeBridge: Add early init & env setup" | Andreas Gampe | 2014-09-24 | 1 | -3/+28 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | ||||||
| | * | | | LibNativeBridge: Add early init & env setup | jgu21 | 2014-09-23 | 1 | -3/+28 | |
* | | | | | am 62e05407: am f6cce347: audio: add HW hotword capture flag | Eric Laurent | 2014-09-24 | 1 | -3/+5 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | audio: add HW hotword capture flag | Eric Laurent | 2014-09-19 | 1 | -3/+5 | |
* | | | | | am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(... | Elliott Hughes | 2014-09-23 | 1 | -8/+4 | |
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | ||||||
| * | | | defined(HAVE_OFF_T) is really just !defined(__APPLE__). | Elliott Hughes | 2014-09-22 | 1 | -8/+4 | |
| | |/ | |/| | ||||||
| * | | Use the correct debuggerd given the tid. | Christopher Ferris | 2014-09-13 | 1 | -3/+16 | |
* | | | am 07dda6b5: Merge "Use the correct debuggerd given the tid." into lmp-dev | Christopher Ferris | 2014-09-13 | 1 | -3/+16 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Use the correct debuggerd given the tid. | Christopher Ferris | 2014-09-12 | 1 | -3/+16 | |
* | | | am e70851f8: am f9b9693b: Merge "liblog: logcat: colored output." | Mark Salyzyn | 2014-09-12 | 1 | -0/+1 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | liblog: logcat: colored output. | Pierre Zurek | 2014-09-11 | 1 | -0/+1 |