summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix injection of specially intercepted keys like HOME.Jeff Brown2010-06-303-11/+0
* Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerb...Andreas Huber2010-06-300-0/+0
|\
* \ am d581484e: Merge "Verify hostname where possible, and clarify where not." i...Doug Zongker2010-06-300-0/+0
|\ \
| * | Merge "Verify hostname where possible, and clarify where not." into froyoDoug Zongker2010-06-300-0/+0
* | | Implement default key handling for native code.Dianne Hackborn2010-06-303-2/+76
| |/ |/|
* | am b4d2e42a: docs: revise menu guide to focus more on using menu resources in...Scott Main2010-06-300-0/+0
|\ \ | |/
* | Merge "Added encoding parameters set up for H263 video encoder" into gingerbreadJames Dong2010-06-290-0/+0
|\ \
* \ \ Merge "Fix native input dispatch in the emulator." into gingerbreadChris Tate2010-06-293-28/+96
|\ \ \ | |/ / |/| |
| * | Fix native input dispatch in the emulator.Jeff Brown2010-06-293-28/+96
* | | am 4fb91d9f: docs: fix typoScott Main2010-06-290-0/+0
|\ \ \ | | |/ | |/|
* | | Merge "remove a hack that was used only used on h/w we no longer support." in...Mathias Agopian2010-06-292-72/+1
|\ \ \
| * | | remove a hack that was used only used on h/w we no longer support.Mathias Agopian2010-06-292-72/+1
* | | | set up fast-forward from froyo-release to gingerbreadThe Android Open Source Project2010-06-290-0/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-140-0/+0
| |\ \ \
| * \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-110-0/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-100-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-080-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-080-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-070-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-030-0/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-280-0/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-101-3/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-066-31/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-216-83/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-153-2/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-123-58/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \