summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Frameworks/base: Wall Werror in libs/storage"Andreas Gampe2014-11-085-13/+23
|\
| * Frameworks/base: Wall Werror in libs/storageAndreas Gampe2014-10-225-13/+23
* | Merge "Frameworks/base: Fix two warnings in cmds"Andreas Gampe2014-11-083-5/+3
|\ \
| * | Frameworks/base: Fix two warnings in cmdsAndreas Gampe2014-11-083-5/+3
|/ /
* | Merge "Frameworks/base: Wall Werror in libs/androidfw"Andreas Gampe2014-11-0711-250/+412
|\ \
| * | Frameworks/base: Wall Werror in libs/androidfwAndreas Gampe2014-11-0711-250/+412
* | | Merge "Frameworks/base: Turn on -Wall -Werror in cmds"Andreas Gampe2014-11-0715-85/+80
|\ \ \ | |/ / |/| |
| * | Frameworks/base: Turn on -Wall -Werror in cmdsAndreas Gampe2014-11-0715-85/+80
|/ /
* | resolved conflicts for merge of 97014933 to stage-aosp-masterDan Albert2014-11-050-0/+0
|\ \
| * \ Merge "Fix a wonderful copy/paste time bomb."Dan Albert2014-11-051-32/+35
| |\ \
| | * | Fix a wonderful copy/paste time bomb.Dan Albert2014-10-161-32/+35
* | | | am b0cb0734: Merge "Track change to Conscrypt"Kenny Root2014-11-033-4/+4
|\ \ \ \ | |/ / /
| * | | Merge "Track change to Conscrypt"Kenny Root2014-11-033-4/+4
| |\ \ \
| | * | | Track change to ConscryptKenny Root2014-10-313-4/+4
* | | | | am 5f8099ed: Merge "Add java.util.List import."Narayan Kamath2014-11-031-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add java.util.List import."Narayan Kamath2014-11-031-0/+1
| |\ \ \ \
| | * | | | Add java.util.List import.Narayan Kamath2014-11-031-0/+1
| |/ / / /
* | | | | am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""Narayan Kamath2014-11-032-170/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Revert "Revert "Remove unused apache related API."""Narayan Kamath2014-11-032-170/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Revert "Revert "Remove unused apache related API.""Narayan Kamath2014-11-032-170/+0
* | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBaligh Uddin2014-10-312-2/+2
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-302-2/+2
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBaligh Uddin2014-10-3172-14/+587
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3072-14/+587
| |/ / / / /
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBaligh Uddin2014-10-318-12/+12
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-308-12/+12
| |/ / / / /
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBaligh Uddin2014-10-3172-298/+298
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3072-298/+298
| |/ / / / /
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBaligh Uddin2014-10-3173-6602/+7111
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3073-6602/+7111
| |/ / / / /
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBaligh Uddin2014-10-3172-230/+446
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3072-230/+446
| |/ / / / /
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBaligh Uddin2014-10-312-3/+3
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-302-3/+3
| |/ / / / /
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBaligh Uddin2014-10-3172-0/+576
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3072-0/+576
| |/ / / / /
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBaligh Uddin2014-10-3172-218/+146
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3072-218/+146
| |/ / / / /
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBaligh Uddin2014-10-3172-3696/+7956
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3072-3696/+7956
| |/ / / / /
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBaligh Uddin2014-10-3172-11/+83
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3072-11/+83
| |/ / / / /
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3073-1/+77
|/ / / / /
* | | | | am c8dce896: Merge "Fix not to show a log with empty default ime"Elliott Hughes2014-10-301-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix not to show a log with empty default ime"Elliott Hughes2014-10-301-1/+5
| |\ \ \ \
| | * | | | Fix not to show a log with empty default imeHyejin Kim2014-10-301-1/+5
* | | | | | am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."Vladimir Marko2014-10-291-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix android_media_AudioSystem_getMasterMute return type."Vladimir Marko2014-10-291-1/+1
| |\ \ \ \ \
| | * | | | | Fix android_media_AudioSystem_getMasterMute return type.Vladimir Marko2014-10-291-1/+1
| |/ / / / /
* | | | | | am 43a92646: Merge "Use native brige only if we have a private data directory."Calin Juravle2014-10-291-4/+8
|\ \ \ \ \ \ | |/ / / / /