summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | resolved conflicts for merge of 12f87a5b to klp-dev-plus-aospElliott Hughes2013-11-075-10/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7717bcba: am 240cd127: Merge "Move goldfish-specific policy rules to their...Nick Kralevich2013-11-063-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e19ebfee: am a7f254fe: Merge "Remove shell_ash; ash is but ashes."Elliott Hughes2013-11-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 241dbd15: script to handle new static landing pages for sample topicsScott Main2013-10-311-6/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | script to handle new static landing pages for sample topicsScott Main2013-10-311-6/+24
| | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 36ea7a3d: remove the dummy sidenav from samples before populating the real...Scott Main2013-10-302-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | remove the dummy sidenav from samples before populating the real list.Scott Main2013-10-302-0/+9
| * | | | | | | | | | | | | | | | | | am e9fbac49: make expandable lists under each sample sticky so they don\'t co...Scott Main2013-10-302-9/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | make expandable lists under each sample sticky so they don't collapseScott Main2013-10-302-9/+23
| | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am d16a4913: am 48c4bac0: Merge "AArch64: Enable AArch64 support"Ben Cheng2013-10-301-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3c0c1274: Merge "Add n5 landscape-13 device video frame and css." into klp...Dirk Dougherty2013-10-292-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Add n5 landscape-13 device video frame and css." into klp-devDirk Dougherty2013-10-302-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Add n5 landscape-13 device video frame and css.Dirk Dougherty2013-10-292-0/+20
| * | | | | | | | | | | | | | | | | | | am 57ab9435: Merge "Adjust samples output pages." into klp-devDirk Dougherty2013-10-292-23/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "Adjust samples output pages." into klp-devDirk Dougherty2013-10-292-23/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Adjust samples output pages.Dirk Dougherty2013-10-292-23/+4
| | | | |_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 1a00f7fe: fix \'next\' links to disable them when at the end of a list. Al...Scott Main2013-10-291-6/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | fix 'next' links to disable them when at the end of a list.Scott Main2013-10-291-6/+12
| | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am 72e9dab0: am 7b954f4c: Merge "Add the search path for libgcc.a and crt*.o."Ben Cheng2013-10-281-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am db932024: Merge "Doc change: css for n5 device video frame." into klp-devDirk Dougherty2013-10-262-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Doc change: css for n5 device video frame." into klp-devDirk Dougherty2013-10-272-0/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Doc change: css for n5 device video frame.Dirk Dougherty2013-10-262-0/+13
| | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am 24834ffd: am 4f92abad: Merge "Two quick fixes: fix kernel header location ...Ben Cheng2013-10-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0f798297: am 8c4efac5: Merge "x86: turn on -Wl,--fatal-warnings"Nick Kralevich2013-10-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a2ccae25: Merge "avoid // in copy headers rule" into klp-devColin Cross2013-10-231-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "avoid // in copy headers rule" into klp-devColin Cross2013-10-241-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | avoid // in copy headers ruleColin Cross2013-10-231-1/+3
| | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am a7b5c4a7: Waiting till post MR0 - this impacts signing tools for MR0.Baligh Uddin2013-10-233-53/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Waiting till post MR0 - this impacts signing tools for MR0.Baligh Uddin2013-10-233-53/+17
| | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am a6e0466a: Modify release tools to replace certs in MMAC files.Robert Craig2013-10-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Modify release tools to replace certs in MMAC files.Robert Craig2013-10-223-17/+53
| | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 0068d25b: Include drawables for all densities - b/11270325Alex Medina2013-10-181-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Include drawables for all densities - b/11270325Alex Medina2013-10-181-0/+3
| | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am ad6996a6: am 34cf868b: Merge "Point to the uapi header location for aarch64."Ben Cheng2013-10-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 53619434: Merge "Add blkid to all builds for use by vold." into klp-devJeff Sharkey2013-10-171-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Add blkid to all builds for use by vold." into klp-devJeff Sharkey2013-10-171-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Add blkid to all builds for use by vold.Jeff Sharkey2013-10-161-0/+1
* | | | | | | | | | | | | | | | | | Merge "Push wpa_supplicant modules down to the leaf product config."Ying Wang2013-12-057-15/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Push wpa_supplicant modules down to the leaf product config.Ying Wang2013-12-057-15/+1
* | | | | | | | | | | | | | | | | | | Merge "Delete board config for the unused "emulator" device."Ying Wang2013-12-053-23/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Delete board config for the unused "emulator" device.Ying Wang2013-12-053-23/+0
* | | | | | | | | | | | | | | | | | | Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devi...Ying Wang2013-12-055-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devicesYing Wang2013-12-055-0/+10
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Add utility function find-files-in-subdirs"Ying Wang2013-12-051-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Add utility function find-files-in-subdirsYing Wang2013-12-041-0/+16
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Run ar in Deterministic mode."Ying Wang2013-12-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Run ar in Deterministic mode.Ying Wang2013-12-021-1/+1
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "core: support make 4.00"Ying Wang2013-12-021-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | core: support make 4.00synergydev2013-10-171-4/+2
* | | | | | | | | | | | | | | | | | Merge "Add FORCE_BUILD_RS_COMPAT option."Stephen Hines2013-11-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \