ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,603 Commits 2 Branches 0 Tags 54 MiB
2de01b8ef6
Commit Graph

14603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
2de01b8ef6 am cdeae439: Merge "docs: update dashboard" into froyo 
Merge commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8' into froyo-plus-aosp

* commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8':
  docs: update dashboard
 2010-06-15 19:43:19 -07:00
Scott Main
b7310b28e2 Merge "docs: update dashboard" into froyo 2010-06-15 19:33:03 -07:00
Ying Wang
bcc354a08b am 6567adf8: Move android-common to framework/ex 
Merge commit '6567adf8b637c36817625cd38d64cd4b8510b097' into froyo-plus-aosp

* commit '6567adf8b637c36817625cd38d64cd4b8510b097':
  Move android-common to framework/ex
 2010-06-15 15:32:36 -07:00
Ying Wang
98294e50d7 Move android-common to framework/ex 
This is one necessary step by unbundling.

Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
 2010-06-15 15:28:42 -07:00
Joe Onorato
b03eaf3f65 am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo 
Merge commit '27357fc08802d796a6b6a1111ac5534d75fc8be7' into froyo-plus-aosp

* commit '27357fc08802d796a6b6a1111ac5534d75fc8be7':
  Use the droidcore goal with dist-for-goals.
 2010-06-15 14:24:58 -07:00
Joe Onorato
9161e1ce2a am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo 
Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into froyo-plus-aosp

* commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
 2010-06-15 14:24:51 -07:00
Joe Onorato
d103af4f4e Merge "Use the droidcore goal with dist-for-goals." into froyo 2010-06-15 13:59:10 -07:00
Joe Onorato
fa5f5bc4a6 Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo 2010-06-15 13:58:33 -07:00
The Android Open Source Project
70dcdfd240 merge from open-source master 
Change-Id: Ib9ec3f3b7418d064b643577156d7d16688b3048d
 2010-06-15 11:44:09 -07:00
The Android Open Source Project
32df01f775 merge from open-source master 
Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
 2010-06-15 11:37:17 -07:00
The Android Open Source Project
0acbc14307 merge from open-source master 
Change-Id: I12af4b88c1881a6a120031459bc63d87b1dd4956
 2010-06-15 11:34:57 -07:00
Scott Main
14e2e18666 am 457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo 
Merge commit '457738e628ee4d165014996bcf4e8d1983ac5929' into froyo-plus-aosp

* commit '457738e628ee4d165014996bcf4e8d1983ac5929':
  docs: add information about known issues in resource matching
 2010-06-15 10:45:55 -07:00
Scott Main
08de33c872 am 322e7e47: Merge "docs: fix markup error" into froyo 
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into froyo-plus-aosp

* commit '322e7e477d89aca18d65cbd289343e716c45a699':
  docs: fix markup error
 2010-06-15 10:45:50 -07:00
Jean-Baptiste Queru
3f049d6aa6 Merge "Fix that InputDeviceReaderThread that got killed during startup" 2010-06-15 10:40:51 -07:00
Scott Main
10d3c342b0 Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo 2010-06-15 10:36:27 -07:00
Scott Main
3dde3706fa Merge "docs: fix markup error" into froyo 2010-06-15 10:36:14 -07:00
The Android Open Source Project
734a19df4e merge from open-source master 
Change-Id: I4d7b0ec9895d8b090e0cdf2efb6731358a5d087c
 2010-06-15 09:32:37 -07:00
The Android Open Source Project
98cdedf972 merge from open-source master 
Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c
 2010-06-15 09:30:31 -07:00
The Android Open Source Project
4707d6e922 merge from open-source master 
Change-Id: I227bf1b5f1de8f858df72d58a4463aed5cc09cbc
 2010-06-15 09:27:48 -07:00
Jean-Baptiste Queru
f4729d230c Merge "Use stride for source and target buffers when copybit is enabled." 2010-06-15 07:49:05 -07:00
Jean-Baptiste Queru
4b2005c9fb Merge "Replaced deprecated String Constructor" 2010-06-14 16:23:58 -07:00
The Android Open Source Project
9bc88eed9d merge from open-source master 
Change-Id: I381f1faaa26a7e52e9882976f32f703fc2aa9c75
 2010-06-14 14:28:18 -07:00
The Android Open Source Project
1a4ab4aa0e merge from open-source master 
Change-Id: Ia8a5ab84bb9957b4a3daf92a9a21905212867a95
 2010-06-14 14:18:32 -07:00
Jean-Baptiste Queru
e3b45a8eff Merge "Fix data type of RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS in RIL." 2010-06-14 13:54:25 -07:00
Jean-Baptiste Queru
8216ca8aa0 Merge "Corrected SPN and PLMN name handling" 2010-06-14 12:47:49 -07:00
The Android Open Source Project
5c4c784bd7 merge from open-source master 
Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
 2010-06-14 11:07:32 -07:00
The Android Open Source Project
f7ac9f5f68 merge from open-source master 
Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
 2010-06-14 11:06:33 -07:00
The Android Open Source Project
07ba8effde merge from open-source master 
Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e
 2010-06-14 11:02:30 -07:00
The Android Open Source Project
16f60b78d4 merge from open-source master 
Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
 2010-06-14 10:57:53 -07:00
Jean-Baptiste Queru
9cff675dcd Merge "replaced deprecated getIntent with parseURI" 2010-06-14 10:28:23 -07:00
Jean-Baptiste Queru
ac3e5138d6 Merge "Added an addAll to the ArrayAdapter" 2010-06-14 09:27:14 -07:00
Jean-Baptiste Queru
511be955d9 Merge "Should accept "application/vnd.wap.multipart.alternative" message." 2010-06-14 08:56:49 -07:00
Dirk Dougherty
ed7e29fac3 am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo 
Merge commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b' into froyo-plus-aosp

* commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b':
  Doc change: remove pdf summary of guidelines from templates archive.
 2010-06-11 16:57:45 -07:00
Dirk Dougherty
6c622422b6 Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo 2010-06-11 16:49:14 -07:00
Irfan Sheriff
96c05c8df0 merge from open-source master 
Change-Id: I8a950276787e9439420db396d0e32f88bd6e04cc
 2010-06-11 15:14:29 -07:00
The Android Open Source Project
24ad68f215 merge from open-source master 
Change-Id: Ia668b322a02e220b74c222dbbcc5b4fdc3c59ab0
 2010-06-11 13:08:02 -07:00
Jean-Baptiste Queru
1bfdbf7165 Merge "WLAN: Reset power save mode to startup value after DHCP response." 2010-06-11 11:12:15 -07:00
Irfan Sheriff
8a9a65637a am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo 
Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into froyo-plus-aosp

* commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b':
  Remove indefinite DHCP retries
 2010-06-10 19:02:13 -07:00
Irfan Sheriff
c17564db5a Merge "Remove indefinite DHCP retries" into froyo 2010-06-10 18:56:04 -07:00
Joe Onorato
977a647e81 Use the droidcore goal with dist-for-goals. 
Change-Id: Ie0042028c4a33a23a4eb9aed1d1015e580c3e168
 2010-06-10 18:36:58 -07:00
Mike Lockwood
1550bc01c1 am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo 
Merge commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into froyo-plus-aosp

* commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
  Don't adjust lights if screen or button brightness is changed when the screen is off.
 2010-06-10 15:30:33 -07:00
Mike Lockwood
68c92f3410 Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo 2010-06-10 15:28:31 -07:00
Adam Powell
113d0fda7b am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo 
Merge commit '8f2ca788f369892370477212cf9e7a67721a8c16' into froyo-plus-aosp

* commit '8f2ca788f369892370477212cf9e7a67721a8c16':
  Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down.
 2010-06-10 14:14:44 -07:00
Adam Powell
a9d563290e Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo 2010-06-10 14:09:50 -07:00
Nick Kralevich
168a7eca42 am a2c6d5bf: do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch 
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into froyo-plus-aosp

* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
  do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
 2010-06-10 11:50:51 -07:00
Kenny Root
aed039d604 am b00854d4: Import revised translations 
Merge commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e' into froyo-plus-aosp

* commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e':
  Import revised translations
 2010-06-09 22:32:01 -07:00
The Android Open Source Project
5e1b2f531d merge from open-source master 
Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
 2010-06-09 12:17:03 -07:00
The Android Open Source Project
0887ab4d10 merge from open-source master 
Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
 2010-06-09 12:14:58 -07:00
Jean-Baptiste Queru
1e254923ea Merge "Adding mimetypes to the mimetype map used in the web view" 2010-06-09 10:51:16 -07:00
The Android Open Source Project
ae68e08411 ignore from open-source master 
Change-Id: I534482f2c6ef252d704809fb0ce2f38f9f3d0cef
 2010-06-09 09:21:39 -07:00