summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* am aa997294: Merge "Revert "Add temporary functor lifetime logging"" into jb-devChris Craik2012-05-091-1/+0
|\
| * Merge "Revert "Add temporary functor lifetime logging"" into jb-devChris Craik2012-05-081-1/+0
| |\
| | * Revert "Add temporary functor lifetime logging"Chris Craik2012-05-081-1/+0
* | | am 4bbcae7e: Merge "Fix issue where scale-animating text would jump temporari...Chet Haase2012-05-072-8/+5
|\ \ \ | |/ /
| * | Merge "Fix issue where scale-animating text would jump temporarily a few pixe...Chet Haase2012-05-072-8/+5
| |\ \
| | * | Fix issue where scale-animating text would jump temporarily a few pixelsChet Haase2012-05-072-8/+5
* | | | am 6c5f4cd0: Merge "Fix hang/crash in native path code" into jb-devChet Haase2012-05-042-0/+27
|\ \ \ \ | |/ / /
| * | | Fix hang/crash in native path codeChet Haase2012-05-032-0/+27
| | |/ | |/|
* | | am 3421f9fd: Merge "Add temporary functor lifetime logging" into jb-devChris Craik2012-05-021-0/+1
|\ \ \ | |/ /
| * | Add temporary functor lifetime loggingChris Craik2012-05-021-0/+1
* | | am 0632b35b: Merge "Improve handling of built-in keyboard." into jb-devJeff Brown2012-05-011-3/+4
|\ \ \ | |/ /
| * | Merge "Improve handling of built-in keyboard." into jb-devJeff Brown2012-05-011-3/+4
| |\ \ | | |/ | |/|
| | * Improve handling of built-in keyboard.Jeff Brown2012-05-011-3/+4
* | | am 3b83dc42: Merge "Fix launcher invisibility bug" into jb-devChet Haase2012-05-011-2/+2
|\ \ \ | |/ /
| * | Fix launcher invisibility bugChet Haase2012-05-011-2/+2
| |/
* | resolved conflicts for merge of 13c04786 to jb-dev-plus-aospJean-Baptiste Queru2012-05-011-10/+21
|\ \
| * \ Merge "Runtime resource overlay: clean-up."Jean-Baptiste Queru2012-05-011-10/+21
| |\ \
| | * | Runtime resource overlay: clean-up.Mårten Kongstad2012-02-161-10/+21
* | | | resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aospJean-Baptiste Queru2012-05-011-3/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge "Build overlay packages just like regular packages."Jean-Baptiste Queru2012-05-011-3/+2
| |\ \ | | |/
| | * Build overlay packages just like regular packages.Mårten Kongstad2012-02-071-3/+2
| * | Update SurfaceTexture interface for forward compatibilityTeng-Hui Zhu2012-04-101-1/+1
| * | am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.aAndrew Hsieh2012-03-221-14/+25
| |\ \
| | * | Added rules to build f/b/libs/utils in 64-bit: lib64utils.aAndrew Hsieh2012-03-221-14/+25
| * | | am 34ccd7af: Merge "Add missing includes for threads.h"Derek Sollenberger2012-03-082-0/+2
| |\ \ \ | | |/ /
| | * | Add missing includes for threads.hDerek Sollenberger2012-03-062-0/+2
| * | | am 69e9c30c: Merge "Add stubs for improved compatibility"Jean-Baptiste Queru2012-02-222-0/+39
| |\ \ \ | | |/ /
| | * | Add stubs for improved compatibilityJean-Baptiste Queru2012-02-212-0/+39
| | |/
| * | am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"Jean-Baptiste Queru2012-01-195-29/+29
| |\ \ | | |/
| | * Rename LOG_ASSERT to ALOG_ASSERTSteve Block2012-01-195-29/+29
| * | am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"Jean-Baptiste Queru2012-01-1982-452/+452
| |\ \ | | |/
| | * Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-1982-452/+452
| * | am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"Jean-Baptiste Queru2012-01-1931-224/+224
| |\ \ | | |/
| | * Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-1931-224/+224
| * | am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"Jean-Baptiste Queru2012-01-1912-52/+52
| |\ \ | | |/
| | * Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-1912-52/+52
| * | am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"Jean-Baptiste Queru2012-01-1953-307/+307
| |\ \ | | |/
| | * Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-1953-307/+307
| * | Merge ee4618bcJean-Baptiste Queru2012-01-1940-326/+326
| |\ \ | | |/
| | * Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-1940-326/+326
| * | am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"Jean-Baptiste Queru2012-01-194-12/+12
| |\ \ | | |/
| | * Rename (IF_)LOG() to (IF_)ALOG()Steve Block2012-01-184-12/+12
* | | Merge "Resample touch events on frame boundaries." into jb-devJeff Brown2012-04-273-51/+302
|\ \ \
| * | | Resample touch events on frame boundaries.Jeff Brown2012-04-273-51/+302
* | | | Merge "Work-around for a Skia rasterization bug Bug #6411457" into jb-devRomain Guy2012-04-273-38/+108
|\ \ \ \
| * | | | Work-around for a Skia rasterization bugRomain Guy2012-04-273-38/+108
* | | | | Merge "Decode common GL error codes when logging frame error status" into jb-devRomain Guy2012-04-261-1/+10
|\ \ \ \ \ | |/ / / /
| * | | | Decode common GL error codes when logging frame error statusRomain Guy2012-04-261-1/+10
* | | | | Merge "On new content, attach functor directly" into jb-devJohn Reck2012-04-261-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | On new content, attach functor directlyChris Craik2012-04-251-4/+4
| |/ / /