summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Include the amr wb encoder shared library in all builds.Andreas Huber2012-02-011-0/+1
| | | | Change-Id: I5f61c696336cf77d49d08b6f99d60046774e91f2
* Merge "Include the amr encoder shared library in all builds."Andreas Huber2012-02-011-0/+1
|\
| * Include the amr encoder shared library in all builds.Andreas Huber2012-02-011-0/+1
| | | | | | | | Change-Id: Ib2c4b8ee73d0615e712c672b9badd156906811e6
* | Delete unused var.Ying Wang2012-02-011-2/+0
| | | | | | | | Change-Id: Ib6c295287f064529a8b4d8ada15a9fbb73064f1e
* | Merge "Set install name with absolute path for Mac host shared libraries."Ying Wang2012-02-011-0/+7
|\ \
| * | Set install name with absolute path for Mac host shared libraries.Ying Wang2012-01-311-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Before this change, path of the install name is relative to the top dir. That means you can execute dynamically-linked binaries only in the top dir. With this change, you can execute dynamically-linked binaries anywhere. Change-Id: I1c6441579ffb68505ea678296aceb2e66a6df1be
* | | am 96601e74: Ignore 75c781c9The Android Open Source Project2012-02-010-0/+0
|\ \ \ | |_|/ |/| | | | | * commit '96601e740e073d77b8f699e81792a1dcb4ff9f09':
| * | Ignore 75c781c9The Android Open Source Project2012-02-010-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: Id97047a665c03bcf35785fba3785cf5575f3341b
| | * \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I1d101ce7d4690a74f494cdc605e797130946210c
* | | \ \ am 402e36f1: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '402e36f189cfa1de55deb575da2c34d97fe95389': IMM30B IMM29 IMM26B IMM26 IMM26B
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Icc486a00d6c067c87364023fcf7226686dc0642a
| | * | | IMM30BThe Android Automerger2012-01-311-1/+1
| | | | |
| | * | | IMM29The Android Automerger2012-01-311-1/+1
| | | | |
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-310-0/+0
| | |\ \ \
| | | * | | IMM26BThe Android Automerger2012-01-301-1/+1
| | | | | |
| | | * | | IMM26The Android Automerger2012-01-301-1/+1
| | | | | |
| | | * | | IMM26BThe Android Automerger2012-01-301-1/+1
| | | | | |
| | | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-300-0/+0
| | | |\ \ \ | | | |/ / / | | |/| | |
* | | | | | am a57f538a: am 7f24ddbc: Merge "docs: add the sidenav h2 back to the ↵Scott Main2012-02-011-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stylesheet for compatibility w/ javadocs" into ics-mr1 * commit 'a57f538a22b99ae0e72e18e95d19635d2e6e0762': docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs
| * | | | | am 7f24ddbc: Merge "docs: add the sidenav h2 back to the stylesheet for ↵Scott Main2012-01-311-1/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | compatibility w/ javadocs" into ics-mr1 * commit '7f24ddbc75b301cd3520e8fefaeb2e94a6dcc80b': docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs
| | * | | | Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ ↵Scott Main2012-01-311-1/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | javadocs" into ics-mr1
| | | * | | | docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocsScott Main2012-01-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I37551efd09bea528200a93a8d3602ea11e63f140
* | | | | | | am 769a02fd: am 5be15a0f: Merge "docs: update TOS and PP links to point to ↵Scott Main2012-02-011-3/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704" into ics-mr1 * commit '769a02fd81fdf7e2a92c8282fa5eee05a4273b63': docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704
| * | | | | am 5be15a0f: Merge "docs: update TOS and PP links to point to unified ↵Scott Main2012-01-311-3/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704" into ics-mr1 * commit '5be15a0f13ce559ca6339f0d2cf3dca9f3001dc1': docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704
| | * | | | Merge "docs: update TOS and PP links to point to unified policy/tems also ↵Scott Main2012-01-311-3/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704" into ics-mr1
| | | * | | | docs: update TOS and PP links to point to unified policy/temsScott Main2012-01-311-3/+5
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704 Change-Id: Icd6e9b7fb742b05a3c2064b6f2f7767b5b7ed1d8
* | | | | | am a20557fb: am 2032e319: docs: add schema.org sitenavigation scope for sid-navsScott Main2012-01-301-4/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'a20557fb4ddb3f008caf7bdb920c9ab90945ef7f': docs: add schema.org sitenavigation scope for sid-navs
| * | | | | am 2032e319: docs: add schema.org sitenavigation scope for sid-navsScott Main2012-01-301-4/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '2032e31979d0708120b4785bad6ee19ee1c4dc0c': docs: add schema.org sitenavigation scope for sid-navs
| | * | | | docs: add schema.org sitenavigation scope for sid-navsScott Main2012-01-301-4/+4
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I0952195223f93bda67af0b951c3a061fe92948ce
* | | | | am 3728f56b: am 939c3f72: docs: modify css to support sidenav headings with ↵Scott Main2012-01-301-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets * commit '3728f56bc62f35d576b12180f5bbf33d0c83f00d': docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
| * | | | am 939c3f72: docs: modify css to support sidenav headings with span, instead ↵Scott Main2012-01-301-1/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets * commit '939c3f72280fadbdc192b6bedd97555c2fcd4ef3': docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
| | * | | docs: modify css to support sidenav headings with span, instead of h2Scott Main2012-01-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because I suspect the h2 is sending mixed signals to search engines for result snippets Change-Id: I80f13774f25439efebcade1b9db41c005018d2aa
* | | | | Merge "Increase java heap size."Wink Saville2012-01-301-1/+1
|\ \ \ \ \
| * | | | | Increase java heap size.Wink Saville2012-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I got an Out of memory while compiling, Andreas Huber suggested that increasing the heap size, which worked. Change-Id: Id8293ef100ef814b0fe13aa6e1b891a36a2ee853
* | | | | | am 1d5b7c54: am 3652a113: docs: add support for meta descriptions in the <head>Scott Main2012-01-303-7/+11
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '1d5b7c5490d256bdaa516db4aaed584e9f0d1469': docs: add support for meta descriptions in the <head>
| * | | | | am 3652a113: docs: add support for meta descriptions in the <head>Scott Main2012-01-303-7/+11
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '3652a113d1a099ece283e3154188f4a42958c298': docs: add support for meta descriptions in the <head>
| | * | | | docs: add support for meta descriptions in the <head>Scott Main2012-01-303-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ff7a5083a75dde718b4701623e029c225289617
* | | | | | Merge "Added libstagefright_soft_aacenc to all builds of all products"James Dong2012-01-301-1/+2
|\ \ \ \ \ \
| * | | | | | Added libstagefright_soft_aacenc to all builds of all productsJames Dong2012-01-301-1/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | o related-to-bug: 5939000 Change-Id: I938890486ba560d598888a3dd73c8b16d3d82aa0
* | | | | | am 4e29e398: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-300-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4e29e3986710c4078faaac9ae662d8f79d74d51f': IMM30 IMM26 IMM25 IMM24 IMM20C
| * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-300-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: Iae7c919c7e0b4dcbf024514431421cdfd225a507
| | * | | | IMM30The Android Automerger2012-01-301-13/+3
| | | | | |
| | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-300-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | | * | IMM26The Android Automerger2012-01-261-13/+3
| | | | |
| | | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-260-0/+0
| | | |\ \
| | | | * | IMM25The Android Automerger2012-01-251-13/+3
| | | | | |
| | | | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-250-0/+0
| | | | |\ \ | | | |/ / /
| | | | * | IMM24The Android Automerger2012-01-241-13/+3
| | | | | |
| | | | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-240-0/+0
| | | | |\ \ | | | |/ / /
| | | | * | IMM20CThe Android Automerger2012-01-231-1/+1
| | | | | |