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

20420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Hamilton
b9e98d8c6a am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread 
* commit '584afa8dde1777b181e773a491416769f25607a8':
  Improve the docs a bit for foreground dispatch.
 2011-02-08 19:33:53 -08:00
Jeff Hamilton
c9cda41f02 Merge "Improve the docs a bit for foreground dispatch." into gingerbread 2011-02-08 19:30:47 -08:00
Eric Fischer
b5c24f2871 am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'be4b39d2fde3d34539752b99238ceebd97ccf580':
  Import revised translations.  DO NOT MERGE
 2011-02-08 17:32:18 -08:00
Scott Main
ace630d9c1 am 3c01a139: rename SIP doc title 
* commit '3c01a139f0d8ece0e300be26ac41280f1e934747':
  rename SIP doc title
 2011-02-08 17:32:14 -08:00
Scott Main
a12ed5ec38 am c442bc60: docs: move the SIP guide into guide/network/ 
* commit 'c442bc605c80a2900a0ed41345f53d218288de7a':
  docs: move the SIP guide into guide/network/
 2011-02-08 17:32:06 -08:00
Katie McCormick
5ffcfb88f0 am 7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API 
* commit '7134520b2635474c5e7f4902c26e12d0ffcc9c64':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
 2011-02-08 17:31:59 -08:00
Dirk Dougherty
1e6e960d66 am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread 
* commit '01967c0ee104e985167374e41f2c416c1100f767':
  Doc change: Add diff report for api 10.
 2011-02-08 17:31:54 -08:00
Gilles Debunne
2f630a5533 am cdfe8999: Fix for multiple merge problem. 
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.
 2011-02-08 17:31:33 -08:00
Gilles Debunne
a8b288d285 resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp 
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
 2011-02-08 16:33:58 -08:00
Eric Fischer
021223d742 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-02-08 10:00:24 -08:00
Dirk Dougherty
88902d0549 Merge "Doc change: Add diff report for api 10." into gingerbread 2011-02-07 17:21:56 -08:00
Brad Fitzpatrick
a9bc4da260 am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector" 
* commit 'b901c9abff6b3885e1efce2e643b1f8e5ef3fc79':
  Fix a race condition in NativeDaemonConnector
 2011-02-07 10:07:46 -08:00
Brad Fitzpatrick
16cd26a9cd am 9204644d: Merge "Fix a race condition in NativeDaemonConnector" 
* commit '9204644d9e8fc2a3d05ff386b14b349f7a117694':
  Fix a race condition in NativeDaemonConnector
 2011-02-07 10:04:54 -08:00
Brad Fitzpatrick
d9d203315c Merge "Fix a race condition in NativeDaemonConnector" 2011-02-07 09:55:34 -08:00
Dianne Hackborn
b68bef3b70 am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition." 
* commit '4b7c1cacca252f735d23f7e01885214630d83f32':
  Fixing possible race condition.
 2011-02-07 07:51:34 -08:00
Dianne Hackborn
6de8529af6 am bb2e1ef8: Merge "Fixing possible race condition." 
* commit 'bb2e1ef87fe4c5123340035766c759155e6bb90c':
  Fixing possible race condition.
 2011-02-07 07:33:38 -08:00
Dianne Hackborn
8fb929bcb1 Merge "Fixing possible race condition." 2011-02-06 09:06:35 -08:00
Kenny Root
4cb99b4ab6 am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit 'd2a996173e53e7b38ff9b703cc5986d9715508a1':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-04 16:12:14 -08:00
Kenny Root
78bee4871f am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit 'c94a99987d8a49ea599c22ffad0e61db591963e0':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-04 16:01:13 -08:00
Gilles Debunne
3716ff2ddd am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 
* commit '893ac28f75561061a8f334cbd4e47833d7fd7843':
  Blinking runnable is created only if text is editable. DO NOT MERGE.
 2011-02-04 15:50:15 -08:00
Gilles Debunne
973a0c5d67 am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 
* commit '8a6ba494a28702e68b0a8fbd8bac34335536a8f8':
  All runnable are stopped on detach. DO NOT MERGE.
 2011-02-04 15:50:12 -08:00
Gilles Debunne
86411d75b2 am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 
* commit '53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
  SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
 2011-02-04 15:49:56 -08:00
Gilles Debunne
35dc5f703a Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 2011-02-04 15:46:15 -08:00
Gilles Debunne
83d390f8fc Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 2011-02-04 15:46:11 -08:00
Gilles Debunne
ae4c508672 Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 2011-02-04 15:46:06 -08:00
Kenny Root
9766fb35c8 Merge "JPtextinput: Dont break emoji characters when cutting strings." 2011-02-04 15:42:14 -08:00
Brad Fitzpatrick
43b65d6ebc am f664d6f9: am b083d3b8: Merge "Initialize resampling buffer per track." 
* commit 'f664d6f916516860d3e4cf82339d47c6f4fd24a2':
  Initialize resampling buffer per track.
 2011-02-04 10:30:40 -08:00
Brad Fitzpatrick
77c244ff48 am b083d3b8: Merge "Initialize resampling buffer per track." 
* commit 'b083d3b816378ef3b9dceb33b2c2e20510b2632b':
  Initialize resampling buffer per track.
 2011-02-04 10:27:54 -08:00
Brad Fitzpatrick
ef22f460c6 Merge "Initialize resampling buffer per track." 2011-02-04 10:19:06 -08:00
Joe Onorato
55547bc360 am 163c28b5: Merge "Managed dialogs should run on the same thread as their activity." into gingerbread 
* commit '163c28b5ca0a85be4c3f64c5419eb95fec4a6d43':
  Managed dialogs should run on the same thread as their activity.
 2011-02-03 18:08:45 -08:00
Joe Onorato
51a2bdc437 Merge "Managed dialogs should run on the same thread as their activity." into gingerbread 2011-02-03 18:05:20 -08:00
Nick Pelly
87731c6145 am 40684946: Merge "Fix docs type that broke build." into gingerbread 
* commit '40684946cb00080c1c7424885f49a809816dd26e':
  Fix docs type that broke build.
 2011-02-03 16:32:29 -08:00
Nick Pelly
344ff4b82c Merge "Fix docs type that broke build." into gingerbread 2011-02-03 16:27:51 -08:00
Jean-Baptiste Queru
504d094ea2 am 6dbdcd55: am db71bda6: Merge from gingerbread 
* commit '6dbdcd55905e50e533d0d3d9abf735275bca68b6':
 2011-02-03 16:21:47 -08:00
Scott Main
996522b760 am 779f7410: Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread 
* commit '779f7410b35267fafb725061d76fc684cd77f26b':
  cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
 2011-02-03 15:56:02 -08:00
Nick Pelly
2dc7584ef9 am 630ac8df: Merge "NFC documentation overhaul." into gingerbread 
* commit '630ac8df2478cd0d47a90b95fbb13b9de4ad58b1':
  NFC documentation overhaul.
 2011-02-03 15:55:53 -08:00
Scott Main
71d29541b4 Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread 2011-02-03 15:24:40 -08:00
Jean-Baptiste Queru
ca7167f2f6 am db71bda6: Merge from gingerbread 
* commit 'db71bda6f696aff6047e6c26c32e0c08bf6851bc':
 2011-02-03 15:24:24 -08:00
Nick Pelly
eef4bf96a1 Merge "NFC documentation overhaul." into gingerbread 2011-02-03 15:23:17 -08:00
Jean-Baptiste Queru
26ad216859 Merge from gingerbread 
Change-Id: I6b895012db6b96666dc3257b1f2e430925981188
 2011-02-03 14:25:38 -08:00
Jean-Baptiste Queru
317c7912d0 am 8444023f: Merge from open-source gingerbread 
* commit '8444023f351b22816f6827d3314ff81b3533e3d9':
  Fix the Multi-page SMS sending error to several receipents
 2011-02-03 14:09:34 -08:00
Jean-Baptiste Queru
c9b062ecde Merge from open-source gingerbread 
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
 2011-02-03 14:05:23 -08:00
Jean-Baptiste Queru
81f81875bc Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread 2011-02-03 14:02:59 -08:00
Jean-Baptiste Queru
09a49faead am 375afcd5: am 4b8ad9ef: Merge from gingerbread 
* commit '375afcd5d69f47c85960270bf51b83a2b768d446':
 2011-02-03 13:32:08 -08:00
Jean-Baptiste Queru
70ca70dee2 am 4b8ad9ef: Merge from gingerbread 
* commit '4b8ad9effd95508e9966b8a3a355f0a948558ae2':
  Fix delivery report error with PENDING status in SMS
 2011-02-03 13:28:51 -08:00
Jean-Baptiste Queru
9a0255c3c4 Merge from gingerbread 
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
 2011-02-03 13:17:49 -08:00
Jean-Baptiste Queru
3c988fc39c Merge ee4c17ee from gingerbread 
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
 2011-02-03 13:03:53 -08:00
Jean-Baptiste Queru
60bcbd0eae Merge from open-source gingerbread 
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
 2011-02-03 12:41:51 -08:00
Jean-Baptiste Queru
05e90f057a Merge "Fix delivery report error with PENDING status in SMS" into gingerbread 2011-02-03 12:17:47 -08:00
Scott Main
d853f21786 am ca69a634: fix broken links, update the dev guide intro, and update sitemap file 
* commit 'ca69a6340610bfd7e830ff9be64a74085aea037c':
  fix broken links, update the dev guide intro, and update sitemap file
 2011-02-02 18:08:51 -08:00