ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
20,287 Commits 2 Branches 0 Tags 54 MiB
faec72456f
Commit Graph

20287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
faec72456f am 021a822e: am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread 
Merge commit '021a822e76ab34a6404486e23157db6b6c50ec3e'

* commit '021a822e76ab34a6404486e23157db6b6c50ec3e':
  Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
 2010-09-01 13:21:13 -07:00
Daniel Sandler
7d3ca9ceee am 9ce87963: (-s ours) am b1387127: Merge "Fix build (restore deleted assets)." into gingerbread 
Merge commit '9ce879636ebe6e7eabbe4fa3f525cea25d5d9c10'

* commit '9ce879636ebe6e7eabbe4fa3f525cea25d5d9c10':
  Fix build (restore deleted assets).
 2010-09-01 13:21:07 -07:00
Derek Sollenberger
25bb38f64c am 27c6f7d4: am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbread 
Merge commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d'

* commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d':
  Fix invalid comment in WebSettings.
 2010-09-01 13:18:40 -07:00
Daniel Sandler
3192e18402 am 036b3157: (-s ours) am 8f8fcfa3: Notifications are now light-on-dark in the windowshade. 
Merge commit '036b315747200b27cb1d5bc2d7d7cda9b9f8f1f0'

* commit '036b315747200b27cb1d5bc2d7d7cda9b9f8f1f0':
  Notifications are now light-on-dark in the windowshade.
 2010-09-01 13:18:28 -07:00
Andreas Huber
0815caf66f am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread 
Merge commit 'de2b1615d27881d98f483fc9158497fbe1fc5f8d' into gingerbread-plus-aosp

* commit 'de2b1615d27881d98f483fc9158497fbe1fc5f8d':
  Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
 2010-09-01 13:03:27 -07:00
Andreas Huber
76881afbfb Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread 2010-09-01 12:59:04 -07:00
Brian Carlstrom
5b9fbebd8d resolved conflicts for merge of 41e99538 to master 
Change-Id: Idddb72e369f127cd74322c3c7385701c2412e343
 2010-09-01 12:41:36 -07:00
Daniel Sandler
2de45ab7c0 am b1387127: Merge "Fix build (restore deleted assets)." into gingerbread 
Merge commit 'b1387127f18b73d7f1038dad6e432329b78264ae' into gingerbread-plus-aosp

* commit 'b1387127f18b73d7f1038dad6e432329b78264ae':
  Fix build (restore deleted assets).
 2010-09-01 11:48:19 -07:00
Daniel Sandler
b56665681c Merge "Fix build (restore deleted assets)." into gingerbread 2010-09-01 11:46:16 -07:00
Derek Sollenberger
260c04a4c5 am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbread 
Merge commit '1614843e93d98910147380969d034009ecb23aa2' into gingerbread-plus-aosp

* commit '1614843e93d98910147380969d034009ecb23aa2':
  Fix invalid comment in WebSettings.
 2010-09-01 11:32:16 -07:00
Derek Sollenberger
e35742b5d5 Merge "Fix invalid comment in WebSettings." into gingerbread 2010-09-01 11:30:12 -07:00
Daniel Sandler
027d496183 am 8f8fcfa3: Notifications are now light-on-dark in the windowshade. 
Merge commit '8f8fcfa319e0e0af14aa8f8555be58555703af02' into gingerbread-plus-aosp

* commit '8f8fcfa319e0e0af14aa8f8555be58555703af02':
  Notifications are now light-on-dark in the windowshade.
 2010-09-01 11:24:40 -07:00
Brian Carlstrom
6a8f2ad9a5 am 17510863: New Java-based SamplingProfiler 
Merge commit '1751086360056bc60d00f2ed2988bc82be9e7bd9' into gingerbread-plus-aosp

* commit '1751086360056bc60d00f2ed2988bc82be9e7bd9':
  New Java-based SamplingProfiler
 2010-09-01 10:44:56 -07:00
Cary Clark
a79ae175b1 Merge "add web setting for enabling/disabling synthetic links" 2010-09-01 10:13:24 -07:00
Leon Scroggins
926c78cc44 Merge "Move Find on page and Select ActionModes to framework." 2010-09-01 09:22:29 -07:00
Wu-cheng Li
4d6416571f Merge "Remove setPreviewDisplay in CameraService::Client::~Client()." 2010-09-01 08:58:32 -07:00
Leon Scroggins III
4e7207649e Merge "Send delete key events when pressed at beginning of field." 2010-09-01 08:43:47 -07:00
Derek Sollenberger
1e4532540e am 0171bfba: (-s ours) am 73ef5d4e: DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365. 
Merge commit '0171bfba04af5964f8863e334df3ed072a9675ef'

* commit '0171bfba04af5964f8863e334df3ed072a9675ef':
  DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
 2010-09-01 08:31:02 -07:00
Derek Sollenberger
c6f9933204 am 73ef5d4e: DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365. 
Merge commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7' into gingerbread-plus-aosp

* commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7':
  DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
 2010-09-01 06:12:16 -07:00
Maksymilian Osowski
56685cbc51 Merge "Updated the Summarizer to link to the source of the tests." 2010-09-01 04:34:46 -07:00
Maksymilian Osowski
4720582c05 Merge "Changed the code to use forwarding service." 2010-09-01 04:01:00 -07:00
Kristian Monsen
12b7f5bb27 Merge "Fix warnings in docs generation." 2010-09-01 01:59:15 -07:00
Jesse Wilson
e071a6dc5c am 3e25a824: am 795b8aa4: Merge "Removing AWT. See bug 2732079" into gingerbread 
Merge commit '3e25a824067e215df24a939f0bba1bea56b48b66'

* commit '3e25a824067e215df24a939f0bba1bea56b48b66':
  Removing AWT. See bug 2732079
 2010-08-31 23:07:15 -07:00
Jesse Wilson
00afc61591 am 795b8aa4: Merge "Removing AWT. See bug 2732079" into gingerbread 
Merge commit '795b8aa4a3d668627901b27870cddce67c239774' into gingerbread-plus-aosp

* commit '795b8aa4a3d668627901b27870cddce67c239774':
  Removing AWT. See bug 2732079
 2010-08-31 22:59:11 -07:00
Jesse Wilson
b4afe06506 Merge "Removing AWT. See bug 2732079" into gingerbread 2010-08-31 22:50:31 -07:00
Chung-yih Wang
edf16716c8 resolved conflicts for merge of a329aef4 to master 
Change-Id: I5a64ee2b6adc56a7521d2e55a72e519a284d5a7c
 2010-09-01 11:00:33 +08:00
Jason Sams
f72648c7c4 Merge "SubElementData data upload functions." 2010-08-31 19:19:05 -07:00
Chung-yih Wang
0945f0aa24 am 042e9bd9: Add SIP related settings in the Settings.System. 
Merge commit '042e9bd989d9c78e23ed29011b6532743f510625' into gingerbread-plus-aosp

* commit '042e9bd989d9c78e23ed29011b6532743f510625':
  Add SIP related settings in the Settings.System.
 2010-08-31 19:07:31 -07:00
Dianne Hackborn
1edb3c12c5 am ec438e14: am 361199b5: Add PackageManager API to get information about a provider component. 
Merge commit 'ec438e1448ebc578ee5a4c4beb1e26292cdedd6e'

* commit 'ec438e1448ebc578ee5a4c4beb1e26292cdedd6e':
  Add PackageManager API to get information about a provider component.
 2010-08-31 19:06:25 -07:00
Daisuke Miyakawa
4c757d1036 Merge "Add LocalePicker fragment as one of internal components." 2010-08-31 19:05:55 -07:00
Dianne Hackborn
6873e1fe19 am 361199b5: Add PackageManager API to get information about a provider component. 
Merge commit '361199b5e742c6635d4d7a03de6cf37b31cf442c' into gingerbread-plus-aosp

* commit '361199b5e742c6635d4d7a03de6cf37b31cf442c':
  Add PackageManager API to get information about a provider component.
 2010-08-31 19:03:36 -07:00
Dianne Hackborn
6f7488b0b0 am 3f124cc5: am 22cd420b: Merge "Improve debug output when an ANR happens." into gingerbread 
Merge commit '3f124cc5ec31024acac057d0f848125f8da5e905'

* commit '3f124cc5ec31024acac057d0f848125f8da5e905':
  Improve debug output when an ANR happens.
 2010-08-31 19:02:02 -07:00
Dianne Hackborn
782bcf9564 am 22cd420b: Merge "Improve debug output when an ANR happens." into gingerbread 
Merge commit '22cd420bfa431b4ad55e699afadf109dcc54f201' into gingerbread-plus-aosp

* commit '22cd420bfa431b4ad55e699afadf109dcc54f201':
  Improve debug output when an ANR happens.
 2010-08-31 18:58:47 -07:00
Dianne Hackborn
a0f5241ec6 Merge "Improve debug output when an ANR happens." into gingerbread 2010-08-31 18:56:30 -07:00
Dmitri Plotnikov
6a05e4c10e Merge "Adding a parameter to limit the number rows returned" 2010-08-31 17:44:08 -07:00
Jesse Wilson
a173691c10 Removing AWT. See bug 2732079 
Change-Id: I0f29d1edbb90b081d743807605682cb64b53b1bc
 2010-08-31 16:56:51 -07:00
Gilles Debunne
ef46fc449b am ff46a5c9: am d2fbabad: Merge "Fixed single line state on TextView." into gingerbread 
Merge commit 'ff46a5c9bd55c492925ffcb608510a0a3dd8a969'

* commit 'ff46a5c9bd55c492925ffcb608510a0a3dd8a969':
  Fixed single line state on TextView.
 2010-08-31 16:35:53 -07:00
Gilles Debunne
ab2f44a0fb am d2fbabad: Merge "Fixed single line state on TextView." into gingerbread 
Merge commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3' into gingerbread-plus-aosp

* commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3':
  Fixed single line state on TextView.
 2010-08-31 16:22:54 -07:00
Gilles Debunne
f93a3eb96e Merge "Fixed single line state on TextView." into gingerbread 2010-08-31 16:18:06 -07:00
Jeff Brown
9b83cce203 am df02df11: am 307ed31c: Merge "Remove incomplete input device enumeration NDK API." into gingerbread 
Merge commit 'df02df115a594553b3ebaa95a0a7f7185a8787d3'

* commit 'df02df115a594553b3ebaa95a0a7f7185a8787d3':
  Remove incomplete input device enumeration NDK API.
 2010-08-31 15:53:17 -07:00
Irfan Sheriff
f36e8e8262 Merge "Add WifiConfigStore to manage networks" 2010-08-31 15:52:26 -07:00
Jeff Brown
006f136d2b am 307ed31c: Merge "Remove incomplete input device enumeration NDK API." into gingerbread 
Merge commit '307ed31c93f16dd3d34348c92cb22d81ddeba6c0' into gingerbread-plus-aosp

* commit '307ed31c93f16dd3d34348c92cb22d81ddeba6c0':
  Remove incomplete input device enumeration NDK API.
 2010-08-31 15:49:39 -07:00
Eric Laurent
d61b10cc0a am 55e79374: am f560ceab: Merge "Audio Effects: fix problems in volume control." into gingerbread 
Merge commit '55e7937462d107b469a58651d3d51e15086f8e9e'

* commit '55e7937462d107b469a58651d3d51e15086f8e9e':
  Audio Effects: fix problems in volume control.
 2010-08-31 15:49:15 -07:00
Eric Laurent
ca00efe208 am f560ceab: Merge "Audio Effects: fix problems in volume control." into gingerbread 
Merge commit 'f560ceabe11b4f541c568bead61a5ec8f527151c' into gingerbread-plus-aosp

* commit 'f560ceabe11b4f541c568bead61a5ec8f527151c':
  Audio Effects: fix problems in volume control.
 2010-08-31 15:46:41 -07:00
Jeff Brown
875fb77f81 Merge "Remove incomplete input device enumeration NDK API." into gingerbread 2010-08-31 15:45:32 -07:00
Eric Laurent
b3b46883eb Merge "Audio Effects: fix problems in volume control." into gingerbread 2010-08-31 15:43:36 -07:00
Joe Onorato
570141e04f am 1e1a030b: am 47471175: Can\'t have two rules building the stubs and public.xml! 
Merge commit '1e1a030b502acae11dbd11d826d389351910a60f'

* commit '1e1a030b502acae11dbd11d826d389351910a60f':
  Can't have two rules building the stubs and public.xml!
 2010-08-31 15:29:24 -07:00
Jeff Brown
774cf1baa1 Remove incomplete input device enumeration NDK API. 
Change-Id: I32de74ff5fcf0e29179a2aee03ddabd22fa485bb
 2010-08-31 15:24:55 -07:00
Joe Onorato
00800b0be6 am 47471175: Can\'t have two rules building the stubs and public.xml! 
Merge commit '47471175c9d19a00d06a77aa316dcda08be97deb' into gingerbread-plus-aosp

* commit '47471175c9d19a00d06a77aa316dcda08be97deb':
  Can't have two rules building the stubs and public.xml!
 2010-08-31 15:22:04 -07:00
Dirk Dougherty
db466cbe5b Merge "Clean up doc build to use Android custom doclava." 2010-08-31 15:11:45 -07:00