summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'goog/ics-aah'cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingjellybean-stablejellybeancm-10.1Mike Lockwood2012-04-030-0/+0
|\
| * am d816c1b9: Import revised translations. DO NOT MERGEEric Fischer2011-11-211-1/+1
| |\ | | | | | | | | | | | | * commit 'd816c1b97de9609d5479ae85611f9b2bf5f609aa': Import revised translations. DO NOT MERGE
| * \ am ebd5f4de: Import revised translations.Eric Fischer2011-11-012-0/+44
| |\ \ | | | | | | | | | | | | | | | | * commit 'ebd5f4deadf1fe74f268cf6b09fd8e6438de9018': Import revised translations.
| * \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \
| | * \ \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \
| | | * | | reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | |/| | | | |/|/ / /
| | * | | am a4552352: Import revised translations.Eric Fischer2011-10-251-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a455235296fca27f692795d3dc4114e62275392d': Import revised translations.
| | * \ \ \ am 4e42527c: (-s ours) am 787a95a8: (-s ours) Import revised translations. ↵Eric Fischer2011-10-210-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '4e42527c431939c70d82554af8a62667ec24031c': Import revised translations. DO NOT MERGE
| | * \ \ \ \ am f77b4224: Merge "Import revised translations."Eric Fischer2011-10-181-0/+22
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f77b4224f191b214d9e5a3144341c1a6fc295dbc': Import revised translations.
| | * \ \ \ \ \ am cd2d40dd: (-s ours) am 4c580173: (-s ours) Import revised translations. ↵Eric Fischer2011-10-180-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit 'cd2d40ddd910a6ac5cbee603a248de9980a4eee7': Import revised translations. DO NOT MERGE
| | * \ \ \ \ \ \ am 8208dfce: Import revised translations.Eric Fischer2011-09-3045-0/+990
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8208dfce332ead9aaf09ce713cc75c3fb693a10a': Import revised translations.
| | * \ \ \ \ \ \ \ am 4c813fa4: (-s ours) am 5ccc9479: (-s ours) Import revised translations. ↵Eric Fischer2011-09-270-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '4c813fa46522426ed6e66390f539254aee331205': Import revised translations. DO NOT MERGE
| | * \ \ \ \ \ \ \ \ am 525414ba: (-s ours) am 375201f4: (-s ours) Import revised translations. ↵Eric Fischer2011-09-260-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '525414ba158e69797017a836a8696facc7b95b99': Import revised translations. DO NOT MERGE
| | * \ \ \ \ \ \ \ \ \ am 414eac95: (-s ours) am cae13125: (-s ours) Import revised translations. ↵Eric Fischer2011-09-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '414eac9575c71c71a0063932709601067f4def69': Import revised translations. DO NOT MERGE
* | | | | | | | | | | | | Import revised translations.Eric Fischer2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6bf086b356a5fe09980765cfc20ef4f6cddd5b7f
* | | | | | | | | | | | | am d816c1b9: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd816c1b97de9609d5479ae85611f9b2bf5f609aa': Import revised translations. DO NOT MERGE
| * | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-211-1/+1
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I902ce0177371f5306bc043da176a6ec2e2b75a70
* | | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-11-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import revised translations.Eric Fischer2011-11-022-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8928151a924d9ba7f3de822480c6e409f42f3721
* | | | | | | | | | | | | am ebd5f4de: Import revised translations.Eric Fischer2011-11-022-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / | | | | | | | | | | | | * commit 'ebd5f4deadf1fe74f268cf6b09fd8e6438de9018': Import revised translations.
| * / / / / / / / / / / Import revised translations.Eric Fischer2011-11-012-0/+44
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3428a0f6b0b42922152b415a216e665ffc28a0bf
* | | | | | | | | | / am 7b04c17d: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-260-0/+0
|\| | | | | | | | | | | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b04c17debb4f364e27304b3f44e2977f6d476e3': Import revised translations. DO NOT MERGE
| * | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-261-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75eb0f7a40ed4ab41a5b5abf50000ffbcb36263e
* / | | | | | | | Import revised translations.Eric Fischer2011-10-251-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I830be09b8579c7e058f9b12f62a4abe8a8716e82
* | | | | | | | am 787a95a8: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-210-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | * commit '787a95a8c973facb890703159861bb332c2ae655': Import revised translations. DO NOT MERGE
| * | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I65748cd2ab450495bdf4936ab51c15bdeb62d744
* | | | | | | | Merge "Import revised translations."Eric Fischer2011-10-181-0/+22
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Import revised translations.Eric Fischer2011-10-181-0/+22
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Change-Id: I5dee92c878f4396bead512b8d383c7c5fa49d1cb
* | | | | | | am 4c580173: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-180-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit '4c580173e00fdc0dd13d14b02d35b51ee0a0818c': Import revised translations. DO NOT MERGE
| * / / / / Import revised translations. DO NOT MERGEEric Fischer2011-10-181-0/+22
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I02f9e420e7ddbdf15838552d728fe5b010accdda
* | | | / Import revised translations.Eric Fischer2011-09-3045-0/+990
| |_|_|/ |/| | | | | | | | | | | Change-Id: Ia249132cea0288c580391acafa2a720837e17107
* | | | am 5ccc9479: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-270-0/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * commit '5ccc94791648b22e01aa51ed513f2d24ec7f745f': Import revised translations. DO NOT MERGE
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-09-271-1/+1
| | | | | | | | | | | | | | | | Change-Id: I11793c01897a55da4ad8660bad266d2de10b147d
* | | | am 375201f4: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-260-0/+0
|\| | | | |_|/ |/| | | | | | | | * commit '375201f4b44f5fb3ea6eb744cee3be68f0f3dabd': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2011-09-265-0/+110
| | | | | | | | | | | | Change-Id: Ie874dd6cfb5ed7f9e606a68b3105652243af1777
* | | am cae13125: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-230-0/+0
|\| | | |/ |/| | | | | * commit 'cae13125692ed00f1a2470d46ef29856aff16ae5': Import revised translations. DO NOT MERGE
| * Import revised translations. DO NOT MERGEEric Fischer2011-09-2340-0/+880
|/ | | | Change-Id: Ib0bd229bf00b26825eb99f88fb178eea15d2f3f1
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-4/+0
| | | | | | Bug: 5010576 Change-Id: I07d8e9d72696e70ba0ce2cef174531b8d4bdfc10
* Fix RS graphics samples.Stephen Hines2011-05-021-1/+1
| | | | Change-Id: I1a08fddc65336399f01ca163e35c39172cdd1018
* Alter colors for holo spiral wallpaperAdam Powell2011-01-313-4/+4
| | | | Change-Id: Ifd49f80f4f6fe87e65164f8ed4a741e79ee5d16c
* renderscript api cleanupAlex Sakhartchouk2010-12-211-10/+11
| | | | Change-Id: Id7a064f43d9ae52ad85ce63bb9213f26da02673d
* Changed package nameAdam Lesinski2010-12-161-1/+1
| | | | Change-Id: I1e585b3c9525fe331ce04fee57ac1846642f3597
* Remove unnecessary uploads.Jason Sams2010-12-161-1/+0
| | | | Change-Id: I62ff3165f3b2b3f129aec3b8b26157271985e746
* Merge "Update for Allocation API changes."Jason Sams2010-12-151-2/+1
|\
| * Update for Allocation API changes.Jason Sams2010-12-141-2/+1
| | | | | | | | Change-Id: I46cfb89801e6e4b206ac3af8ef664a022262fbf2
* | Add Context to a RenderScript or RenderScriptGL instance.Shih-wei Liao2010-12-091-1/+1
|/ | | | | | | This is to allow RenderScript to better interact with the Android environment. E.g., per-app cache. Change-Id: Ie6b7ed6b6ccdcfaebac7e971f7e0273ce7f0916d
* API updateJason Sams2010-12-063-19/+14
| | | | Change-Id: I803a4b044849bb5e5cfc590543e5213e9c862867
* First version of Holo SpiralAdam Lesinski2010-10-2816-0/+887
| | | | Change-Id: Id298aa928e1590e8246f53526eb065956bbdc6f4
* new project, first commitAnatol Pomozov2010-10-270-0/+0
|
* new project, first commitAnatol Pomozov2010-10-270-0/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 15:48:23 +0000