summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge aosp/master fixes into lmp-devstaging/cm-12.0-cafstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0bohu2014-10-229-8/+129
* merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-210-0/+0
|\
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-210-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-190-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-160-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-150-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-140-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-130-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-120-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-090-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-080-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-070-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-060-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-050-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-10-010-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-09-300-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-09-290-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-09-280-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-09-250-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-09-240-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-09-230-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-09-220-0/+0
|/|
| * merge in lmp-release history after reset to 6dc9b1b64a3a01ddcce9e664dc0153021...The Android Automerger2014-09-210-0/+0
|/|
| * merge in lmp-release history after reset to 2e6a15f7a40895681412356e9c7f5740c...The Android Automerger2014-09-200-0/+0
| |\ | |/ |/|
* | Merge "Make the size of "cb_handle_t" same for 32/64-bit" into lmp-devVince Harron2014-09-191-1/+5
|\ \
| * | Make the size of "cb_handle_t" same for 32/64-bitTina Zhang2014-09-181-1/+5
| |/
* | Merge "Upgrade goldfish sensor HAL module to 1_0" into lmp-devVince Harron2014-09-191-11/+16
|\ \
| * | Upgrade goldfish sensor HAL module to 1_0bohu2014-09-181-11/+16
| |/
* / Remove display initialization from eglGetProcAddress APITina Zhang2014-09-181-9/+0
|/
* audio HAL: add parameters to open stream functionsEric Laurent2014-07-271-2/+5
* Add audio_input_flags_t to HAL open_input_streamGlenn Kasten2014-07-161-1/+2
* Fix warningsGlenn Kasten2014-07-151-0/+1
* am 3059c3dc: Revert "Revert "goldfish: Fix /cache partition type.""Xavier Ducrohet2014-06-211-2/+1
|\
| * Revert "Revert "goldfish: Fix /cache partition type.""Xavier Ducrohet2014-06-201-2/+1
* | am c50716f7: Revert "goldfish: Fix /cache partition type."Xavier Ducrohet2014-06-201-1/+2
|\|
| * Revert "goldfish: Fix /cache partition type."Xavier Ducrohet2014-06-201-1/+2
* | am f4c61a39: goldfish: Fix /cache partition type.David 'Digit' Turner2014-06-180-0/+0
|\|
| * goldfish: Fix /cache partition type.David 'Digit' Turner2014-06-181-2/+1
* | am 765b8b4b: am 7ea757df: Merge "goldfish: camera: fix 64-bit warnings"Colin Cross2014-06-188-39/+45
|\ \
| * \ am 7ea757df: Merge "goldfish: camera: fix 64-bit warnings"Colin Cross2014-06-188-39/+45
| |\ \
| | * \ Merge "goldfish: camera: fix 64-bit warnings"Colin Cross2014-06-178-39/+45
| | |\ \
| | | * | goldfish: camera: fix 64-bit warningsColin Cross2014-06-188-39/+45
| | |/ /
* | | | am f448dd4f: am eed789f0: Merge "goldfish: Fix /cache partition type."David 'Digit' Turner2014-06-171-2/+1
|\| | |
| * | | am eed789f0: Merge "goldfish: Fix /cache partition type."David 'Digit' Turner2014-06-171-2/+1
| |\| |
| | * | Merge "goldfish: Fix /cache partition type."David 'Digit' Turner2014-06-171-2/+1
| | |\ \
| | | * | goldfish: Fix /cache partition type.David 'Digit' Turner2014-06-181-2/+1
| | |/ /
* | | | am fe6007cf: am 690792a6: Merge "Revert "Revert "goldfish: cache image is not...Greg Hackmann2014-06-111-1/+2
|\| | |
| * | | am 690792a6: Merge "Revert "Revert "goldfish: cache image is not ext4. yet."""Greg Hackmann2014-06-111-1/+2
| |\| |
| | * | Merge "Revert "Revert "goldfish: cache image is not ext4. yet."""Greg Hackmann2014-06-101-1/+2
| | |\ \
| | | * | Revert "Revert "goldfish: cache image is not ext4. yet.""Greg Hackmann2014-06-111-1/+2