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

28647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Hamilton
2ac5673e83 am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread 
* commit 'c1cc9ba6d1e2b7f1e213d215e3edb97acea79901':
  More documentation updates for NFC.
 2011-02-10 13:52:48 -08:00
Dirk Dougherty
0cbf55999f am 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 
* commit '8d56f6decf9efd29b286e02c549510d681b7573d':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-10 13:52:40 -08:00
Nick Pelly
6f1ae086a9 am 47dac545: am 39cf3a44: Document NFC permissions. 
* commit '47dac545da6468e5b46e940917eb6711c02b8e84':
  Document NFC permissions.
 2011-02-10 13:52:34 -08:00
Jeff Hamilton
165c1ad42f am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread 
* commit '1ac35411f186dca346e8d9078a4fd2d570bb8a97':
  Improve the docs a bit for foreground dispatch.
 2011-02-10 13:52:23 -08:00
Eric Fischer
0c365669ad am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'c1c314334757e0ab3c244023aec1b24433b66b48':
  Import revised translations.  DO NOT MERGE
 2011-02-10 13:50:51 -08:00
Scott Main
22201fb079 am 129c7372: am 3c01a139: rename SIP doc title 
* commit '129c73723f2241f762f485a9b5421bfae3cbbdcd':
  rename SIP doc title
 2011-02-10 13:50:44 -08:00
Scott Main
81363d359f resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp 
Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
 2011-02-10 13:47:32 -08:00
Katie McCormick
b91f20af98 resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp 
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
 2011-02-10 12:38:07 -08:00
Alex Sakhartchouk
31e6d2e0d3 am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb 
* commit '699a0969434b6ee434dd9f5f212fe1bb914fdf0d':
  DO NOT MERGE Removing an activity that shouldn't go into samples
 2011-02-09 15:23:54 -08:00
Dirk Dougherty
257497d912 am 0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb 
* commit '0e40519beefe3d2ea0870a8eecac1a58f1fb6403':
  Doc change: add diff report for API 11
 2011-02-09 15:21:49 -08:00
Alex Sakhartchouk
65bcbcc831 Merge "DO NOT MERGE Removing an activity that shouldn't go into samples" into honeycomb 2011-02-09 15:20:21 -08:00
Dirk Dougherty
4917dbf6a5 Merge "Doc change: add diff report for API 11" into honeycomb 2011-02-09 15:19:08 -08:00
Dirk Dougherty
094217876b am fefa95a9: Doc change: Add version notes for Android 2.3.3. 
* commit 'fefa95a9c828d2b67227894b7ee3979504c0f52a':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-09 14:20:06 -08:00
Mathias Agopian
42ebf195b2 am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb 
* commit 'cc24170dc653ea5fc9fe7b9b8c596700c4d6dc99':
  fix [3374821] Cannot take screenshot of HC preview
 2011-02-09 13:22:46 -08:00
Mathias Agopian
5d90264a79 Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb 2011-02-09 13:18:53 -08:00
Dirk Dougherty
93457e74e9 am be04bfd0: am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread 
* commit 'be04bfd09914bbabf715959170c32030072b65f4':
  Doc change: Add diff report for api 10.
 2011-02-09 12:19:54 -08:00
Gilles Debunne
78fd484d9b am 63bd55c7: am cdfe8999: Fix for multiple merge problem. 
* commit '63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441':
  Fix for multiple merge problem.
 2011-02-09 12:19:46 -08:00
Eric Fischer
b14ac99db7 am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'ebcbde6a6e5a8da947a3f28eba7207256b891fdd':
  Import revised translations.  DO NOT MERGE
 2011-02-09 10:47:47 -08:00
Eric Fischer
aa9484720d Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-09 10:11:18 -08:00
Jeff Hamilton
1ce30b2dfa am 58c9d472: Merge "More documentation updates for NFC." into gingerbread 
* commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
  More documentation updates for NFC.
 2011-02-09 00:36:53 -08:00
Jeff Hamilton
0858b00d05 Merge "More documentation updates for NFC." into gingerbread 2011-02-09 00:34:22 -08:00
Dirk Dougherty
714319b575 am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 
* commit 'a3f53afd13bc1722464e169cb82a01d3898852b5':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-08 23:27:53 -08:00
Nick Pelly
3d7a394315 am 39cf3a44: Document NFC permissions. 
* commit '39cf3a445e507f219ecc8a476f6038f095d9d520':
  Document NFC permissions.
 2011-02-08 23:25:29 -08:00
Dirk Dougherty
6e0c56dfe3 Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 2011-02-08 23:24:22 -08:00
Gilles Debunne
82f05a1673 Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-02-08 20:38:59 -08:00
Gilles Debunne
c1b753b09b resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp 
Change-Id: I59886953b76857ab0a089947e1c5335b93f68d5e
 2011-02-08 20:36:04 -08:00
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
Scott Main
0461cb7364 am 3f41d8f5: docs: fix a couple titles 
* commit '3f41d8f5ee1a8d5366d79ee03d97fac8403c676a':
  docs: fix a couple titles
 2011-02-08 18:48:53 -08:00
Scott Main
497b81b7eb am f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb 
* commit 'f002b6752562a442c934bdf7c04cb0fedc24d442':
  docs: shorten and revise some titles in the Developing docs and resolve respective links
 2011-02-08 18:39:24 -08:00
Scott Main
b7e4dc39a1 Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb 2011-02-08 18:36:04 -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
Joe Malin
9b587ca015 am 7777fb04: Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb 
* commit '7777fb04f1bdb11628ef8978c42b14e51ebb9c56':
  DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc
 2011-02-08 16:58:22 -08:00
Joe Malin
668192f6c3 Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb 2011-02-08 16:55:53 -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
Scott Main
22a9ed6105 am b70afd34: docs: remove and correct parent links for fundamental docs and hide the "beginner\'s path" because it\'s not complete 
* commit 'b70afd342b658d23518e0fa69aff9e45ec01e222':
  docs: remove and correct parent links for fundamental docs and hide the "beginner's path" because it's not complete
 2011-02-08 14:57:50 -08:00
Scott Main
cc71ecc39d am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb 
* commit 'b508d6e26e3a1fd68bf637dc29df335f0e7ccd92':
  docs: fix links to revised fundamentals documents
 2011-02-08 14:57:45 -08:00
Jason Sams
5ec57f6012 am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb 
* commit '4fd70373ecafbf5a87a1c35852aec2818612e928':
  Fix bug 3421901 remove 2 functions from public headers in the SDK.
 2011-02-08 14:57:35 -08:00
Dirk Dougherty
2b41054871 am 50b7d70f: Merge "Cherrypick from gb: Doc change: Add diff report for api 10." into honeycomb 
* commit '50b7d70fb425daf6b2ead747df6634040d1bbf1b':
  Cherrypick from gb: Doc change: Add diff report for api 10.
 2011-02-08 14:57:25 -08:00
Xavier Ducrohet
99743c3db3 am dc3fc3dc: Merge "LayoutLib: fix the background of title/action bars." into honeycomb 
* commit 'dc3fc3dc2717461113a2963c224cb190457599d8':
  LayoutLib: fix the background of title/action bars.
 2011-02-08 14:57:19 -08:00
Scott Main
b9d70cd8e5 Merge "docs: fix links to revised fundamentals documents" into honeycomb 2011-02-08 13:34:51 -08:00
Jason Sams
a7febe0f05 Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb 2011-02-08 12:07:49 -08:00
Dirk Dougherty
daffe8e563 Merge "Cherrypick from gb: Doc change: Add diff report for api 10." into honeycomb 2011-02-08 11:04:41 -08:00
Xavier Ducrohet
e3c117f1b3 Merge "LayoutLib: fix the background of title/action bars." into honeycomb 2011-02-08 11:03:43 -08:00
Eric Fischer
3f15d63b99 am c7bece13: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'c7bece13495949db1736263a7cf5cf67c6165c51':
  Import revised translations.  DO NOT MERGE
 2011-02-08 10:40:47 -08:00