aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Linux compilation fix"Jakub Pawlowski2017-02-211-0/+4
|\
| * Merge "Linux compilation fix"Treehugger Robot2017-02-211-0/+4
| |\
| | * Linux compilation fixJakub Pawlowski2017-02-211-0/+4
| |/
* | Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b4...Pavlin Radoslavov2017-01-202-59/+32
|\ \
| * \ Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410Pavlin Radoslavov2017-01-202-59/+32
| |\ \
| | * | Merge "Change build config of aac from Android.mk to Android.bp"Pavlin Radoslavov2017-01-202-59/+32
| | |\|
| | | * Merge "Change build config of aac from Android.mk to Android.bp"Treehugger Robot2017-01-202-59/+32
| | |/|
| | | * Change build config of aac from Android.mk to Android.bpPavlin Radoslavov2017-01-192-59/+32
| | |/
* | | Merge "Remove redundant register storage class specifiers" am: ed91226cec am:...Martin Storsjo2016-10-282-9/+9
|\| |
| * | Merge "Remove redundant register storage class specifiers" am: ed91226cecMartin Storsjo2016-10-282-9/+9
|/| | | |/
| * Merge "Remove redundant register storage class specifiers"Martin Storsjo2016-10-282-9/+9
| |\
| | * Merge "Remove redundant register storage class specifiers"Treehugger Robot2016-10-282-9/+9
| | |\
| | | * Remove redundant register storage class specifiersMartin Storsjo2016-10-182-9/+9
| | |/
* | | Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8Martin Storsjo2016-10-184-30/+28
|\| |
| * | Merge "Add casts to avoid errors due to narrowing"Martin Storsjo2016-10-184-30/+28
|/| | | |/
| * Merge "Add casts to avoid errors due to narrowing"Treehugger Robot2016-10-184-30/+28
| |\
| | * Add casts to avoid errors due to narrowingMartin Storsjo2016-10-174-30/+28
| |/
* | Merge "Avoid a warning about extra parentheses" am: f935254cc9 am: 899335d310Jean-Michel Trivi2016-09-091-1/+1
|\ \
| * \ Merge "Avoid a warning about extra parentheses" am: f935254cc9Jean-Michel Trivi2016-09-091-1/+1
| |\ \
| | * | Merge "Avoid a warning about extra parentheses"Jean-Michel Trivi2016-09-091-1/+1
| |/| | | | |/
| | * Merge "Avoid a warning about extra parentheses"Jean-Michel Trivi2016-09-091-1/+1
| |/|
| | * Avoid a warning about extra parenthesesMartin Storsjo2016-08-301-1/+1
| |/
* | Merge "Disable warnings that are not easily fixable" am: 8192b1a am: 2a923c9Glenn Kasten2016-04-201-0/+1
|\|
| * Merge "Disable warnings that are not easily fixable" am: 8192b1aGlenn Kasten2016-04-201-0/+1
| |\
| | * Merge "Disable warnings that are not easily fixable"Glenn Kasten2016-04-201-0/+1
| | |\
| | | * Merge "Disable warnings that are not easily fixable"Glenn Kasten2016-04-201-0/+1
| | | |\
| | | | * Disable warnings that are not easily fixableGlenn Kasten2016-04-181-0/+1
* | | | | Merge "Add default case for undefined pointer initialization" am: 9d0179c am:...Glenn Kasten2016-04-201-0/+3
|\| | | |
| * | | | Merge "Add default case for undefined pointer initialization" am: 9d0179cGlenn Kasten2016-04-201-0/+3
| |\| | |
| | * | | Merge "Add default case for undefined pointer initialization"Glenn Kasten2016-04-201-0/+3
| | |\| |
| | | * | Merge "Add default case for undefined pointer initialization"Glenn Kasten2016-04-201-0/+3
| | | |\|
| | | | * Add default case for undefined pointer initializationGlenn Kasten2016-04-181-0/+3
* | | | | Merge "Left shift of negative int is undefined" am: 6ae5480 am: 2b2e97bGlenn Kasten2016-04-201-25/+25
|\| | | |
| * | | | Merge "Left shift of negative int is undefined" am: 6ae5480Glenn Kasten2016-04-201-25/+25
| |\| | |
| | * | | Merge "Left shift of negative int is undefined"Glenn Kasten2016-04-201-25/+25
| | |\| |
| | | * | Merge "Left shift of negative int is undefined"Glenn Kasten2016-04-201-25/+25
| | | |\|
| | | | * Left shift of negative int is undefinedGlenn Kasten2016-04-181-25/+25
* | | | | resolve merge conflicts of ad1e898 to nyc-dev-plus-aospGlenn Kasten2016-04-204-7/+6
|\| | | |
| * | | | resolve merge conflicts of ad1e898 to nyc-dev-plus-aospGlenn Kasten2016-04-204-7/+6
| |\| | |
| | * | | Merge "Remove redundant parentheses around == comparison operator"Glenn Kasten2016-04-204-7/+6
| | |\| |
| | | * | Merge "Remove redundant parentheses around == comparison operator"Glenn Kasten2016-04-204-7/+6
| | |/| | | | | |/
| | | * Remove redundant parentheses around == comparison operatorGlenn Kasten2016-04-184-7/+6
| | |/
* | | Merge "Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b7...Android Build Merger (Role)2016-04-190-0/+0
|\ \ \
| * \ \ Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4...Jean-Michel Trivi2016-04-190-0/+0
| |\ \ \
| | * \ \ Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4...Jean-Michel Trivi2016-04-190-0/+0
| | |\ \ \
* | | \ \ \ Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4...Jean-Michel Trivi2016-04-190-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4...Jean-Michel Trivi2016-04-190-0/+0
|/| | | | | | |/ / | |/| |
| * | | Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4...Jean-Michel Trivi2016-04-190-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4...Jean-Michel Trivi2016-04-191-9/+1
| | |\ \
| | | * | Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4...Jean-Michel Trivi2016-04-191-9/+1
| | |/| |