StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,485 Commits 1 Branch 0 Tags
c63a2b36d74dadb51a9cdcc71ad470111ebe3f02
Commit Graph

86485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
356f7a2f15 am 3e747ac3: Add clean step for /system/bin/bugreport symlink 
Merge commit '3e747ac3fe688c231bbf5591ee02226b394adf26' into eclair-plus-aosp

* commit '3e747ac3fe688c231bbf5591ee02226b394adf26':
  Add clean step for /system/bin/bugreport symlink
 2009-09-03 14:21:50 -07:00
Jean-Baptiste Queru
dc785843c7 merge from donut 2009-09-03 14:12:45 -07:00
Mike Lockwood
3e747ac3fe Add clean step for /system/bin/bugreport symlink 
Change-Id: Ib2abb22184b16b6b3c5bc0e38141922f3fcbfca0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-09-03 15:01:07 -04:00
The Android Open Source Project
b3e1907cfc DRC65 2009-09-03 10:40:22 -07:00
The Android Open Source Project
9cc32e3f9c Merge commit 'remotes/goog/donut' into donut-release 2009-09-03 10:40:12 -07:00
The Android Open Source Project
99e6ea3b63 ERC65 2009-09-03 08:36:28 -07:00
The Android Open Source Project
5c744908f5 Merge commit 'remotes/goog/eclair' into eclair-release 2009-09-03 08:36:16 -07:00
Dirk Dougherty
49a92efc18 am 5043a836: am af2a2a61: am 4d545a82: Merge change 23037 into donut 
Merge commit '5043a836a77a623578590a6a76f34e2b121fe1e1'

* commit '5043a836a77a623578590a6a76f34e2b121fe1e1':
  Doc changes for SDK update.
 2009-09-02 19:04:00 -07:00
Dirk Dougherty
5043a836a7 am af2a2a61: am 4d545a82: Merge change 23037 into donut 
Merge commit 'af2a2a61ed0b60efa4b0e8852333ed4693834aca' into eclair-plus-aosp

* commit 'af2a2a61ed0b60efa4b0e8852333ed4693834aca':
  Doc changes for SDK update.
 2009-09-02 19:01:33 -07:00
Dirk Dougherty
af2a2a61ed am 4d545a82: Merge change 23037 into donut 
Merge commit '4d545a82917db0ca90494e4cfb7944e1b5ea564a' into eclair

* commit '4d545a82917db0ca90494e4cfb7944e1b5ea564a':
  Doc changes for SDK update.
 2009-09-02 18:58:52 -07:00
Android (Google) Code Review
4d545a8291 Merge change 23037 into donut 
* changes:
  Doc changes for SDK update. Update SDK toc template.
 2009-09-02 18:57:09 -07:00
Doug Zongker
dc8d202008 am 0646e78e: am d7d7ab00: do a pass of normal-chunk-merging before comparing src and tgt files 
Merge commit '0646e78e9969762ead938f953c7283d984333d99'

* commit '0646e78e9969762ead938f953c7283d984333d99':
  do a pass of normal-chunk-merging before comparing src and tgt files
 2009-09-02 13:34:19 -07:00
Doug Zongker
99677d23a2 am 279bae71: am 15604b84: use imgdiff -z to diff zipfiles 
Merge commit '279bae719765f4fb9fc372323d680690b5842f90'

* commit '279bae719765f4fb9fc372323d680690b5842f90':
  use imgdiff -z to diff zipfiles
 2009-09-02 13:33:28 -07:00
Doug Zongker
0646e78e99 am d7d7ab00: do a pass of normal-chunk-merging before comparing src and tgt files 
Merge commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54' into eclair-plus-aosp

* commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54':
  do a pass of normal-chunk-merging before comparing src and tgt files
 2009-09-02 11:15:52 -07:00
Doug Zongker
d7d7ab00f5 do a pass of normal-chunk-merging before comparing src and tgt files 
Merge the gzip footer and header together with any adjacent normal
chunks before comparing chunk structures; this should make the
recovery-from-boot diff not fail due to differences in the footer
after the ramdisk part of the image.
 2009-09-02 11:10:51 -07:00
Doug Zongker
279bae7197 am 15604b84: use imgdiff -z to diff zipfiles 
Merge commit '15604b84e246514da6c9721266919003f734380b' into eclair-plus-aosp

* commit '15604b84e246514da6c9721266919003f734380b':
  use imgdiff -z to diff zipfiles
 2009-09-02 08:56:05 -07:00
The Android Open Source Project
d2fd326df4 ERC64 2009-09-02 08:36:47 -07:00
The Android Open Source Project
3a5013d94e DRC63C 2009-09-01 22:14:49 -07:00
Doug Zongker
15604b84e2 use imgdiff -z to diff zipfiles 
imgdiff now understands the zip file format and can produce smaller
patches by doing the patching in uncompressed space.  Start taking
advantage of this for .zip, .apk, and .jar files.
 2009-09-01 17:53:34 -07:00
The Android Open Source Project
b638230512 ERC63B 2009-09-01 15:15:59 -07:00
The Android Open Source Project
f007ed9ce6 Merge commit 'remotes/goog/eclair' into eclair-release 2009-09-01 15:15:44 -07:00
The Android Open Source Project
1b039fc5ac DRC63B 2009-09-01 15:14:42 -07:00
Scott Main
c2b5b036d4 am d90f315f: am cca05d9e: am a01ee1ea: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs 
Merge commit 'd90f315fc0cba9c473e53c57a74a9071e10dedac'

* commit 'd90f315fc0cba9c473e53c57a74a9071e10dedac':
  docs only.
 2009-09-01 12:15:33 -07:00
Jean-Baptiste Queru
4730a61599 am 37321fde: merge from open-source master 
Merge commit '37321fdeeffc707cb33bd433dca27f18c205d1fe'

* commit '37321fdeeffc707cb33bd433dca27f18c205d1fe':
  kcm tool fix for the keyboard output permissions
 2009-09-01 12:14:15 -07:00
The Android Open Source Project
9f6de0f7d2 DRC63 2009-09-01 11:30:04 -07:00
The Android Open Source Project
9c149a93de Merge commit 'remotes/goog/donut' into donut-release 2009-09-01 11:29:55 -07:00
Scott Main
d90f315fc0 am cca05d9e: am a01ee1ea: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs 
Merge commit 'cca05d9e658b4357995a73ca72793d46100aae8e' into eclair-plus-aosp

* commit 'cca05d9e658b4357995a73ca72793d46100aae8e':
  docs only.
 2009-09-01 10:43:15 -07:00
Scott Main
cca05d9e65 am a01ee1ea: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs 
Merge commit 'a01ee1ea93cd2a4d876fcb5678392bbd277b6042' into eclair

* commit 'a01ee1ea93cd2a4d876fcb5678392bbd277b6042':
  docs only.
 2009-09-01 10:41:03 -07:00
Scott Main
a01ee1ea93 docs only. 
my previous change to the list styles was the wrong solution.
this fixes all prior problems with nested lists in OLs, ULs, and DLs
 2009-09-01 10:36:55 -07:00
The Android Open Source Project
454f2994e9 ERC63 2009-09-01 08:36:24 -07:00
The Android Open Source Project
65b6e964e0 Merge commit 'remotes/goog/eclair' into eclair-release 2009-09-01 08:36:13 -07:00
Jean-Baptiste Queru
37321fdeef merge from open-source master 2009-09-01 08:27:43 -07:00
Xavier Ducrohet
9427e73b73 am 9396155d: Add camera feature files to the SDK system image. 
Merge commit '9396155dae1a23171a388fcd3c3c8d64a9439062'

* commit '9396155dae1a23171a388fcd3c3c8d64a9439062':
  Add camera feature files to the SDK system image.
 2009-08-31 18:04:56 -07:00
Xavier Ducrohet
9396155dae Add camera feature files to the SDK system image. 
Without this the system refuses to install applications that
requires the camera (like ApiDemos)

Change-Id: Ia13b6a10f4731bf23eea04e3210ad0b3ed557aa6
 2009-08-31 16:46:51 -07:00
Anonymous Coward
a577600718 am 6fc63e1f: am f9f9d4f3: Remove WebSearchProvider from build specs. 
Merge commit '6fc63e1f82f8a2110c109eda90c19898f2aef4ae'

* commit '6fc63e1f82f8a2110c109eda90c19898f2aef4ae':
  Remove WebSearchProvider from build specs.
 2009-08-31 16:44:18 -07:00
The Android Open Source Project
b6ca6975f1 DRC62 2009-08-31 16:42:21 -07:00
The Android Open Source Project
4beb2674ad Merge commit 'remotes/goog/donut' into donut-release 2009-08-31 16:42:08 -07:00
Andy McFadden
9611ceb460 Flush every line of output. 
Works better when the output is piped through "tee" to a file.
 2009-08-31 13:38:35 -07:00
Anonymous Coward
6fc63e1f82 am f9f9d4f3: Remove WebSearchProvider from build specs. 
Merge commit 'f9f9d4f3c393537f9cab5e8cc59d241ad2279474' into eclair

* commit 'f9f9d4f3c393537f9cab5e8cc59d241ad2279474':
  Remove WebSearchProvider from build specs.
 2009-08-31 10:53:49 -07:00
Anonymous Coward
f9f9d4f3c3 Remove WebSearchProvider from build specs. 2009-08-31 10:47:18 -07:00
The Android Open Source Project
304d049c4f ERC62 2009-08-31 08:36:13 -07:00
The Android Open Source Project
df709c6099 Merge commit 'remotes/goog/eclair' into eclair-release 2009-08-31 08:36:00 -07:00
Joe Onorato
88ad7c5d46 am db7ab295: Merge change 23258 into eclair 
Merge commit 'db7ab295c4d6e9b03ea3149ad015699f63221087'

* commit 'db7ab295c4d6e9b03ea3149ad015699f63221087':
  Add the ability to turn on proguard for java targets, and to call aapt
 2009-08-30 13:49:27 -07:00
Android (Google) Code Review
db7ab295c4 Merge change 23258 into eclair 
* changes:
  Add the ability to turn on proguard for java targets, and to call aapt to generate a rules file for proguard for stuff from the manifest and other resources that need to be kept.
 2009-08-30 13:44:22 -07:00
Joe Onorato
2daa2b3b05 Add the ability to turn on proguard for java targets, and to call aapt 
to generate a rules file for proguard for stuff from the manifest and
other resources that need to be kept.
 2009-08-30 13:43:00 -07:00
Brett Chabot
153b0d9a4f am 04253940: am 3c7c8a60: Merge change 22522 into donut 
Merge commit '0425394081908f9f7c357c927c9d446d778b79e3'

* commit '0425394081908f9f7c357c927c9d446d778b79e3':
  Add Gesture tests to CTS.
 2009-08-29 16:49:02 -07:00
Brett Chabot
0425394081 am 3c7c8a60: Merge change 22522 into donut 
Merge commit '3c7c8a60860f97ac4c7381bd6ed30a43864372da' into eclair

* commit '3c7c8a60860f97ac4c7381bd6ed30a43864372da':
  Add Gesture tests to CTS.
 2009-08-29 16:44:39 -07:00
Android (Google) Code Review
3c7c8a6086 Merge change 22522 into donut 
* changes:
  Add Gesture tests to CTS.
 2009-08-29 16:42:25 -07:00
The Android Open Source Project
e2989179ce DRC59 2009-08-28 14:20:38 -07:00
The Android Open Source Project
1503b4257a ERC59B 2009-08-28 14:05:01 -07:00