aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add lint check for duplicate activity registrations"Tor Norbye2012-05-164-1/+90
|\
| * Add lint check for duplicate activity registrationsTor Norbye2012-05-164-1/+90
* | am caef4b1b: Merge "gltrace: Update trace control protocol."Siva Velusamy2012-05-161-0/+3
|\ \
| * \ Merge "gltrace: Update trace control protocol."Siva Velusamy2012-05-161-0/+3
| |\ \
| | * | gltrace: Update trace control protocol.Siva Velusamy2012-05-161-0/+3
* | | | am 9dac107d: Merge "Improve search of items into style for legacy layoutlibs."Xavier Ducrohet2012-05-162-12/+14
|\ \ \ \ | |/ / /
| * | | Merge "Improve search of items into style for legacy layoutlibs."Xavier Ducrohet2012-05-162-12/+14
| |\ \ \ | | |_|/ | |/| |
| | * | Improve search of items into style for legacy layoutlibs.Xavier Ducrohet2012-05-162-12/+14
| |/ /
* | | am 7911fa1e: Merge "Fix new config chooser for show-included-layouts"Tor Norbye2012-05-161-15/+2
|\ \ \ | |/ /
| * | Merge "Fix new config chooser for show-included-layouts"Tor Norbye2012-05-161-15/+2
| |\ \
| | * | Fix new config chooser for show-included-layoutsTor Norbye2012-05-161-15/+2
| |/ /
| | |
| \ \
*-. \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \ \ \ | |_|/ / |/| | |
| | * | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-160-0/+0
| | |\ \
| | | * \ merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | | |\ \
| * | | \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-160-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-080-0/+0
| | | |\ \
| | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-04-260-0/+0
| | | | |\ \
| | | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-04-250-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-190-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-180-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-170-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-160-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-120-0/+0
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-110-0/+0
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-050-0/+0
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-040-0/+0
| | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-030-0/+0
| | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-020-0/+0
| | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-290-0/+0
| | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-280-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-270-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-260-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | * | | merge in jb-release history after reset to masterThe Android Automerger2012-03-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-02-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-02-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-02-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \