Commit Graph

1739 Commits

Author SHA1 Message Date
Scott Main
045c6f4e64 am a640bb13: am a5d1dc9d: am bd63fb87: am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev
* commit 'a640bb13ed893afd0eaed2dbc7363118caf27209':
  docs: misc bug fixes from external issues
2012-08-14 12:47:31 -07:00
Scott Main
a5d1dc9d03 am bd63fb87: am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev
* commit 'bd63fb875c49d69d5969df35ae159bd17cadb730':
  docs: misc bug fixes from external issues
2012-08-14 12:42:12 -07:00
Scott Main
bd63fb875c am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev
* commit '6958c161a9f12aaa1db33bdc526040c3691638dc':
  docs: misc bug fixes from external issues
2012-08-14 12:40:41 -07:00
Scott Main
183bf11697 docs: misc bug fixes from external issues
Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
2012-08-13 19:12:13 -07:00
Joe Malin
929b7ef46a am ad4abf7d: am 863b19bc: Merge "Bug 6954576: Typos and errors in topic" into jb-mr1-dev
* commit 'ad4abf7dcae59f3b90929ba7080f4c1b012b1b1f':
  Bug 6954576: Typos and errors in topic
2012-08-13 18:07:30 -07:00
Nick Kralevich
cbb6011778 am f5fb3bdf: am ab7cd91a: Merge "Spelling." into jb-mr1-dev
* commit 'f5fb3bdf7c5554c5a2428d92add46bfef02cbd39':
  Spelling.
2012-08-13 18:04:36 -07:00
Joe Malin
863b19bc8f Merge "Bug 6954576: Typos and errors in topic" into jb-mr1-dev 2012-08-13 18:02:16 -07:00
Nick Kralevich
13cd6420a0 Spelling.
Change-Id: Ie69d99139355b66e9bb62087cd5f6cd677a51cfa
2012-08-13 17:52:17 -07:00
Scott Main
fa4e9c0610 am 886590ab: am 68b3f065: am 922e038b: am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev
* commit '886590aba861cf7f6364371b5988630912cf5d9b':
  fix misc doc bugs from external issues
2012-08-10 12:44:16 -07:00
Scott Main
68b3f065b6 am 922e038b: am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev
* commit '922e038b087076260ae7e29facc8121d46e8ba3c':
  fix misc doc bugs from external issues
2012-08-10 12:36:34 -07:00
Joe Malin
955d7cceda Bug 6954576: Typos and errors in topic
Change-Id: Ibc42e84b1662d12ca5494a59ad67365759017c1d
2012-08-10 09:56:54 -07:00
Scott Main
922e038b08 am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev
* commit 'ea31b47a72a6fed1269e2ba3c29c438212322bf0':
  fix misc doc bugs from external issues
2012-08-09 17:03:16 -07:00
Scott Main
cb0b2df114 fix misc doc bugs from external issues
Change-Id: I11b1d524dd2159b58c65d3ef7a76af15624ae365
2012-08-09 16:38:12 -07:00
Joe Malin
cbd0e09aa7 am fba8c80b: am 4aa3c034: Fix contentprovider docs android:exported default
* commit 'fba8c80b26c289032c265faf2425852cc3fac9b6':
  Fix contentprovider docs android:exported default
2012-08-09 14:22:49 -07:00
Joe Malin
4aa3c034f5 Fix contentprovider docs android:exported default
Change-Id: I30682905e99fa3d05b6315c011e290fe509588f4
2012-08-09 13:02:36 -07:00
Nick Kralevich
9663215edc am ebd997d8: am 9d16c219: Merge "Content Providers: change default for android:exported" into jb-mr1-dev
* commit 'ebd997d8662e52a64318b1f3c531d61e6e76bfc3':
  Content Providers: change default for android:exported
2012-08-08 10:54:26 -07:00
Nick Kralevich
9d16c219f1 Merge "Content Providers: change default for android:exported" into jb-mr1-dev 2012-08-08 10:50:05 -07:00
Katie McCormick
0cb9cf3c31 resolved conflicts for merge of eaf84a3f to master
Change-Id: I6282f109116d6ffc63c8fe1d6ea18f8e25ae35f3
2012-08-07 15:08:04 -07:00
Katie McCormick
e4fcedff53 Merge "cherrypick from jb-dev docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9" into jb-mr1-dev 2012-08-07 14:22:17 -07:00
Scott Main
8a7947f85b am 4ef34ea3: am a335b06c: am 9e28fa45: am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev
* commit '4ef34ea30ab60208a9fbf32aef4d5bb66aaf3ac4':
  docs: fix hdef variable
2012-08-07 14:09:57 -07:00
Scott Main
e6ec886a4b am 5fef67cb: am b53e9b42: am a8583c29: am 40eee61e: docs: fix broken links and update sitemap text file
* commit '5fef67cbc8c234c5028cc91ef836fd2fb3f183af':
  docs: fix broken links and update sitemap text file
2012-08-07 14:09:53 -07:00
Scott Main
a335b06c67 am 9e28fa45: am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev
* commit '9e28fa459bac0322a5608a4f6c682e0ff9051bed':
  docs: fix hdef variable
2012-08-07 14:05:32 -07:00
Scott Main
b53e9b42c3 am a8583c29: am 40eee61e: docs: fix broken links and update sitemap text file
* commit 'a8583c2934836572632bb82d1fe7607392d4ca72':
  docs: fix broken links and update sitemap text file
2012-08-07 14:05:28 -07:00
Scott Main
9e28fa459b am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev
* commit '0d3a127742b56a9aae9c9c018b7042f49902db8a':
  docs: fix hdef variable
2012-08-07 14:04:09 -07:00
Scott Main
a8583c2934 am 40eee61e: docs: fix broken links and update sitemap text file
* commit '40eee61e25fb887f5267686f8a0a7c5bd9f95769':
  docs: fix broken links and update sitemap text file
2012-08-07 14:04:04 -07:00
Scott Main
0d3a127742 Merge "docs: fix hdef variable" into jb-dev 2012-08-07 14:01:34 -07:00
Scott Main
b111b5785e docs: fix hdef variable
Change-Id: I737258d454f426506e529e3d48fefb1397b9e8d3
2012-08-07 13:59:12 -07:00
Katie McCormick
e5cefd1d52 cherrypick from jb-dev docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Change-Id: I584ba81e923d4150d2b4aed940d790c8298bae7c
2012-08-07 13:00:10 -07:00
Nick Kralevich
f097b16cfd Content Providers: change default for android:exported
Change the default value of android:exported to true
for applications which target a newer API version.
This will help stop inadvertent content provider
exposure to untrusted apps.

Bug: 3306452

Change-Id: I8cb34e823aef9551319951ce92217345c54cee63
2012-08-07 11:34:00 -07:00
Scott Main
40eee61e25 docs: fix broken links
and update sitemap text file

Change-Id: I6982c3f029c46135ae856b8484d906c2882bad3a
2012-08-06 18:04:23 -07:00
Scott Main
819ca9768b am 09ec6aba: am 1398102c: am bd24f5cc: am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about
* commit '09ec6aba00d15bc19a92303d0ed181d0eef4bfc6':
  misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc  code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
2012-08-06 16:01:51 -07:00
Scott Main
1398102c35 am bd24f5cc: am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
* commit 'bd24f5cca5e51ba0e819f943b981cf2e9f64ec46':
  misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc  code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
2012-08-06 15:57:53 -07:00
Scott Main
bd24f5cca5 am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
* commit '53b0fda5fd7c532fc1d93abd5f8a85276821cc6d':
  misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc  code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
2012-08-06 15:48:08 -07:00
Scott Main
53b0fda5fd misc doc bugs.
Fix sdk samples path
Fix method signature in fragment doc code snippet
Fix typo in a11y javadoc  code snippet
Fix markup error in brands page
Fix markup error on content providers doc
Fix typo on about>start page

Change-Id: Ie2a528dd4fbd19e5cb1c0844f6fc6272669c8ab9
2012-08-06 15:43:01 -07:00
Katie McCormick
27ed953f63 am 9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev
* commit '9f94208953fc8da72140c2964bcf12ff5b485784':
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
2012-08-01 16:53:12 -07:00
Katie McCormick
9f94208953 Merge changes I9bd42a8a,I613d0b12 into jb-dev
* changes:
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
2012-08-01 16:49:38 -07:00
Katie McCormick
1cfe4b40d3 am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev
* commit '9c311279726598de073314fb6059feea66957219':
  Doc change: 4K -> 4kb
2012-08-01 16:24:25 -07:00
Katie McCormick
a65d0e78dd Doc change: 4K -> 4kb
Change-Id: Ic563436062c6bd17ba87f3b3cc4c765972b07289
2012-08-01 16:14:47 -07:00
Katie McCormick
dd983ad556 cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Change-Id: I9bd42a8a8842e26797ec4a6e7e45962b1560dc6a
2012-08-01 14:55:22 -07:00
Katie McCormick
613d0b1253 Doc update: Misc minor GCM updates.
Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9

Conflicts:

	docs/html/guide/google/gcm/gcm.jd
2012-08-01 13:45:15 -07:00
Scott Main
92e218837e am e0986d3a: am b8babd68: am bca68970: am 0d9d5831: Merge "fix more broken links" into jb-dev
* commit 'e0986d3a2981e4bd81aca0bcec4c6a4dbbbeb190':
  fix more broken links
2012-08-01 10:29:06 -07:00
Scott Main
b8babd6837 am bca68970: am 0d9d5831: Merge "fix more broken links" into jb-dev
* commit 'bca689703da6f64bfee05dd204149d0f40762344':
  fix more broken links
2012-08-01 10:06:29 -07:00
Scott Main
bca689703d am 0d9d5831: Merge "fix more broken links" into jb-dev
* commit '0d9d583103aca82b6bc0be719b3579ee83760209':
  fix more broken links
2012-08-01 10:02:24 -07:00
Scott Main
f05e34a10c fix more broken links
Change-Id: If4dceab223a6c22827a0645aa5923ddc427b2b85
2012-07-31 18:25:33 -07:00
Scott Main
d8e9959366 am d6d0fb32: am 22a7b9de: am ba751a0a: am f284d492: docs: fix broken links
* commit 'd6d0fb32327d8fa1d43a8e8066d55952d7078d82':
  docs: fix broken links
2012-07-31 15:05:56 -07:00
Scott Main
22a7b9de5e am ba751a0a: am f284d492: docs: fix broken links
* commit 'ba751a0adef55059a2ff6d64903d97309983c536':
  docs: fix broken links
2012-07-31 14:59:53 -07:00
Scott Main
ba751a0ade am f284d492: docs: fix broken links
* commit 'f284d49293aead609de5b83d601260cfd86b7978':
  docs: fix broken links
2012-07-31 14:57:37 -07:00
Scott Main
f284d49293 docs: fix broken links
Change-Id: I0523fb8eb8608b07cf7ca866d0c2ccfcbfc2e946
2012-07-31 14:19:33 -07:00
The Android Open Source Project
0132368c2d Revert "am a21a6075: Reconcile with jb-mr1-release"
This reverts commit 27a2c84958, reversing
changes made to 905272a439.
2012-07-31 10:58:38 -07:00
Scott Main
70b43e4fef am f1d4dc38: am db242310: Merge "docs: add Settings dev guide; a few changes to javadocs" into jb-dev
* commit 'f1d4dc3844510eb02cffd49c81ce2ec297758a6f':
  docs: add Settings dev guide; a few changes to javadocs
2012-07-25 22:23:54 -07:00