summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-010-0/+0
| |\ \ \ \ \
| | * | | | | IML62The Android Automerger2011-12-011-13/+3
| | | | | | |
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-010-0/+0
| | |\ \ \ \ \ | |/ / / / / /
| | * | | | | IML61BThe Android Automerger2011-11-301-1/+1
| | | | | | |
* | | | | | | am d34204b9: am b83d8f15: am f5cbe002: Merge "docs: update template and css ↵Scott Main2011-12-012-35/+203
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add * commit 'd34204b9ec3e79862f5101837ccc6f90909b9850': docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
| * | | | | | am b83d8f15: am f5cbe002: Merge "docs: update template and css for android u ↵Scott Main2011-12-012-35/+203
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/ * commit 'b83d8f15ccc276b190a6c02002f6af94aa2e9cb4': docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
| | * | | | | am f5cbe002: Merge "docs: update template and css for android u Add a custom ↵Scott Main2011-12-012-35/+203
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous link * commit 'f5cbe0024328f6d716dc13b8a836f058c9c74c64': docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
| | | * | | | Merge "docs: update template and css for android u Add a custom version of ↵Scott Main2011-12-012-35/+203
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button." into ics-mr0
| | | | * | | | docs: update template and css for android uScott Main2011-11-302-35/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button. Change-Id: I829c4fb134d6f5c3cee82fb86958d23ef64e8481
* | | | | | | | Merge "Add support for building specific modules with mmm using the ↵Alon Albert2011-11-301-2/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | following syntax: Build all modules: mmm dir Build a single module: mmm dir:module Build multiple modules: mmm dir:module1,module2 Or in other words:"
| * | | | | | | | Add support for building specific modules with mmm using the following syntax:Alon Albert2011-11-301-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build all modules: mmm dir Build a single module: mmm dir:module Build multiple modules: mmm dir:module1,module2 Or in other words: Change-Id: If32770c19f03a4d460f32046a3dd06656e33ee11
* | | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-300-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | Change-Id: I91cfa5357d3530b04123a4faf703598994b2ed5a
| * | | | | | | | IML61The Android Automerger2011-11-301-13/+3
| | | | | | | | |
| * | | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-300-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | IML60CThe Android Automerger2011-11-291-1/+1
| | | | | | | | | |
| | * | | | | | | | IML60BThe Android Automerger2011-11-291-1/+1
| | | | | | | | | |
| | * | | | | | | | IML60The Android Automerger2011-11-291-13/+3
| | | | | | | | | |
| | * | | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-290-0/+0
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / /
| | * | | | | | | | IML59The Android Automerger2011-11-281-13/+3
| | | | | | | | | |
| | * | | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-280-0/+0
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ am f945235a: am 72db32c7: Merge "Google Add-On API Documentation Fixes ↵Marius Renn2011-11-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (5429077)" into ics-mr1 * commit 'f945235a8adc6b163a0e46941791bb305ef37034': Google Add-On API Documentation Fixes (5429077)
| * | | | | | | | | | am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ↵Marius Renn2011-11-301-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '72db32c744744ae1ace26830ecce968b6a95e173': Google Add-On API Documentation Fixes (5429077)
| | * | | | | | | | | Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1Marius Renn2011-11-301-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Google Add-On API Documentation Fixes (5429077)Marius Renn2011-11-231-2/+2
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer want a reference directory, but rather maps_api and effects_api directories. Change-Id: I72b3a342d0871ec4cf7010be0d2b6486ca83571b
* | | | | | | | | | am 8dd412a9: Merge from AOSPJean-Baptiste Queru2011-11-301-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | * commit '8dd412a900c73144b0d868e3e872938052071d95': English must be the first language specified
| * | | | | | | | Merge from AOSPJean-Baptiste Queru2011-11-301-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | Change-Id: I992d4a0baefc08e105f76b7e6f6950516047670a
| | * | | | | | | English must be the first language specifiedBruce Beare2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first language specified in PRODUCT_LOCALS is the default. Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | | | | | | Move the prebuilt NDKs to their own git project prebuilts/ndk/.Ying Wang2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If85986da436d412cff139af1fd8426e420bec121
* | | | | | | | | Move prebuilt SDKs to their own git project.Ying Wang2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6e9614e43bf82b8dd1f8702968be40cfb76b6c5
* | | | | | | | | am d719f6a8: am c99c8c08: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-290-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd719f6a81bc285b437c1babd8f8443d115b0833c': ICL53C
| * | | | | | | | am c99c8c08: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-290-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'c99c8c081467085c548edf03cbc1500ba3852b44': ICL53C
| | * | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-290-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | Change-Id: I612e5d0bd573f86dd61cbe0b47d0b691973539a5
| | | * | | | | | ICL53CThe Android Automerger2011-11-261-1/+1
| | | | | | | | |
* | | | | | | | | am e96a0500: am dc2450ca: Build fix - include sdk/lint in build.Tor Norbye2011-11-280-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e96a0500b442f2f9359acae98de9f56719b63592': Build fix - include sdk/lint in build.
| * | | | | | | | am dc2450ca: Build fix - include sdk/lint in build.Tor Norbye2011-11-280-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc2450ca25d1169a42dbe9de127b730718bc0eb9': Build fix - include sdk/lint in build.
| | * | | | | | | Build fix - include sdk/lint in build.Tor Norbye2011-11-282-0/+3
| | | | | | | | |
* | | | | | | | | Merge "Point OPROFILE_EVENTS_DIR to oprofile dir in source tree."Ben Cheng2011-11-281-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Point OPROFILE_EVENTS_DIR to oprofile dir in source tree.Ben Cheng2011-11-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise oprofile will punt with the following error message when processing results collected by perf events since the event descriptions are not stored in the default location on the host. profile: could not open unit mask description file /usr/local/share/oprofile//arm/armv7/unit_masks Change-Id: I4ff2f2a87546ed3606490596285fb3e466e8d661
* | | | | | | | | | am d6c8cafd: (-s ours) am 3997910e: am 5dd51bde: Build fix - include ↵Tor Norbye2011-11-280-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sdk/lint in build. do not merge. * commit 'd6c8cafdacab939a5f8581afa15377a6449a8058': Build fix - include sdk/lint in build. do not merge.
| * | | | | | | | | am 3997910e: am 5dd51bde: Build fix - include sdk/lint in build. do not merge.Tor Norbye2011-11-280-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3997910eeaff5a605f2f2968dd0c617dcd10183d': Build fix - include sdk/lint in build. do not merge.
| | * | | | | | | | am 5dd51bde: Build fix - include sdk/lint in build. do not merge.Tor Norbye2011-11-280-0/+0
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | / / | | | | |_|_|_|/ / | | | |/| | | | | * commit '5dd51bde0b0b4a8ca6d1b6a8da1f6739197999a2': Build fix - include sdk/lint in build. do not merge.
| | | * | | | | | Build fix - include sdk/lint in build. do not merge.Tor Norbye2011-11-282-0/+3
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 4377cc701a0bef32aaff34d0d119974544fd20d6) Change-Id: I28dd89ad6471c82d344ecf88cecb2b96361b2050
* | | | | | | | am b5acb8b4: am 070e712f: Reconcile with ics-mr0-release ↵The Android Open Source Project2011-11-230-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-factoryrom-2-release * commit 'b5acb8b45904ae5cc17de847c4036d3f6146847c': ITL41G ICL53B
| * | | | | | | am 070e712f: Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-230-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '070e712fb3037b28e81340eb2e4fb53d1539130d': ITL41G ICL53B
| | | | | | | |
| | | \ \ \ \ \
| | *-. \ \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-230-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | Change-Id: Ie10ba0ee48e3f7230c8613b63a6d9b1856b260c6
| | | | * | | | | ITL41GThe Android Automerger2011-11-221-1/+1
| | | | | | | | |
| | | * | | | | | ICL53BThe Android Automerger2011-11-221-13/+3
| | | | | | | | |
| | | * | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-220-0/+0
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
* | | | | | | | | am 330875fd: am 24215999: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-220-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | * commit '330875fdcf830db62a46ceb9bc0e0c3d9f67b775':
| * | | | | | | | am 24215999: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-220-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '24215999d0a9d603aeea3c88ceedfb8e36fcf947': ICL53
generated by cgit v1.1 at 2025-03-28 02:55:25 +0000