drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,764 Commits 1 Branch 0 Tags
Commit Graph

7576 Commits

Author SHA1 Message Date
kmccormick
5298190a30 am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
automerge: 3e92c4a

* commit '3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-30 05:23:58 +00:00
kmccormick
3e92c4a20f am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '1867f2cfdd477cb12c167fc47c79e2e5d6332e24':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:09:23 +00:00
kmccormick
1867f2cfdd Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 2014-10-29 23:04:29 +00:00
kmccormick
2022db08ab Doc update: deliv receipt, rate exceeded, bug fixes. 
Fix for:

b/17936796

Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
 2014-10-29 15:49:36 -07:00
Luan Nguyen
418239190b am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs 
automerge: aec7c97

* commit 'aec7c974eb223b5608bbd2bb06e11fc397e6ffb2':
  docs: fixed typo/grammar issues.
 2014-10-28 01:44:10 +00:00
Joe Fernandez
3d76f6a957 am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
automerge: 90f734e

* commit '90f734eb180619eb8ffd2e30580f72b500184f8b':
  docs:Added 64-bit image note from Preview page
 2014-10-28 01:43:13 +00:00
Natalie Masse
9f6ea5841c am 1e5bb861: Link and typo fixed 
automerge: bcf9ced

* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100':
  Link and typo fixed
 2014-10-28 01:42:13 +00:00
Scott Rowe
e0da6ddc08 am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
automerge: a1e3063

* commit 'a1e3063ebe04c8c304f48a02117085962f75cb63':
  docs: update reference to FragmentRetainInstance
 2014-10-28 01:41:06 +00:00
Joe Fernandez
d6ed5752da am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
automerge: 2f9ea27

* commit '2f9ea27c6c95fa53eef0228edc0b3f63dbeb21e7':
  Typo fixed in sample code
 2014-10-28 01:40:11 +00:00
Ricardo Cervera
884b473ad8 am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
automerge: dc1f308

* commit 'dc1f308048a732572fae3cf92ddfe5cd943c0059':
  docs: Fixing notify link. Bug: 17571861
 2014-10-28 01:38:14 +00:00
Luan Nguyen
cc8b36706c am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
automerge: c07a288

* commit 'c07a288a889ac88282118d4089e969f20c1aabe3':
  docs: Android Wear Design fixes
 2014-10-28 01:37:14 +00:00
smain@google.com
870afdb39a am 075531ae: add the butterbar for L announce to Preview landing page 
automerge: e43bb6a

* commit 'e43bb6a9ec8cd0841926e7df8cc738d5357814c1':
  add the butterbar for L announce to Preview landing page
 2014-10-28 01:36:21 +00:00
smain@google.com
469c8c8983 am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
automerge: 6fbe299

* commit '6fbe299fa5bcc084cd69899afdc3c77767b7c1f5':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-28 01:35:28 +00:00
Ricardo Cervera-Navarro
4687757290 am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
automerge: c93723b

* commit 'c93723bdf9b2ce4dc0426817b8bec924d9f97a79':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-28 01:34:31 +00:00
Rich Slogar
d84910b06b am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
automerge: 858cfad

* commit '858cfad9482817305cc5b846102c3f8e5d12782a':
  docs:SDK tools 23.0.5 Release Note
 2014-10-28 01:33:39 +00:00
Eric Gilmore
068cb36877 Merge commit 'a4eb81b' into klp-modular-dev-plus-aosp 
Conflicts:
	docs/html/guide/topics/connectivity/nfc/nfc.jd
 2014-10-27 17:15:23 -07:00
Luan Nguyen
aec7c974eb am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs 
* commit '049db36afd63b972f971f8bac6a405bc2f9437f4':
  docs: fixed typo/grammar issues.
 2014-10-24 15:59:44 +00:00
Luan Nguyen
049db36afd Merge "docs: fixed typo/grammar issues." into klp-modular-docs 2014-10-24 15:55:48 +00:00
Joe Fernandez
90f734eb18 am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit '0e893eb7ac1985a02d61525a5e6076d45a1e8c7d':
  docs:Added 64-bit image note from Preview page
 2014-10-24 09:27:02 +00:00
Natalie Masse
bcf9ced47a am 1e5bb861: Link and typo fixed 
* commit '1e5bb861265072b9af555d09202e49cb38a3c4f1':
  Link and typo fixed
 2014-10-24 08:13:36 +00:00
Joe Fernandez
0e893eb7ac Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 2014-10-24 06:06:01 +00:00
Natalie Masse
1e5bb86126 Link and typo fixed 
Change-Id: Ie9ace6e002703d7d1f83173da49672cf60ca1653
 2014-10-17 13:50:24 +01:00
Scott Rowe
a1e3063ebe am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'ab64919c0e683dcd0f32f95f580f0d95ce29476d':
  docs: update reference to FragmentRetainInstance
 2014-10-16 17:01:04 +00:00
Scott Rowe
ab64919c0e Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 2014-10-16 16:56:55 +00:00
Joe Fernandez
2f9ea27c6c am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '58c64870a8f3505d032ec7c5ac0fc4faba08347a':
  Typo fixed in sample code
 2014-10-16 14:39:16 +00:00
Joe Fernandez
58c64870a8 Merge "Typo fixed in sample code" into klp-modular-docs 2014-10-16 14:34:47 +00:00
Ricardo Cervera
dc1f308048 am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit '8a7ba4c681d16aab194e1c4ab7b7bfcce5012d17':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 15:50:42 +00:00
Ricardo Cervera
8a7ba4c681 Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 2014-10-15 15:47:31 +00:00
Luan Nguyen
c07a288a88 am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit '2a364235d27245d999bb1d6e7621c0d6a0e89ef0':
  docs: Android Wear Design fixes
 2014-10-15 15:17:40 +00:00
Luan Nguyen
2a364235d2 Merge "docs: Android Wear Design fixes" into klp-modular-docs 2014-10-15 15:12:24 +00:00
smain@google.com
e43bb6a9ec am 075531ae: add the butterbar for L announce to Preview landing page 
* commit '075531ae190dd6e64d3a53991a209a624cb0ec63':
  add the butterbar for L announce to Preview landing page
 2014-10-15 03:36:11 +00:00
smain@google.com
075531ae19 add the butterbar for L announce to Preview landing page 
Change-Id: Id84a5a62153281b3daaefc287450d392ecb51bbc
 2014-10-14 19:39:11 -07:00
smain@google.com
6fbe299fa5 am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit 'd8d20f52ec0550477b773cee4c0f0343f2a9301f':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 02:15:35 +00:00
smain@google.com
d8d20f52ec update analytics event tracking calls to use new script 
bug: 16331906

Change-Id: I4cd8f08509cfb887a424696553404ba3c635151b
 2014-10-14 19:03:08 -07:00
Ricardo Cervera-Navarro
c93723bdf9 am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit '7668aa27999e5650fe8776853565f792311fb57d':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:20:02 +00:00
Ricardo Cervera-Navarro
7668aa2799 am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'aa7bcf140d95049f1482c896b770de7ba339f7c9':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:14:16 +00:00
Ricardo Cervera-Navarro
aa7bcf140d Merge "Revert "docs: Watermarked images for codes that weren't found."" into klp-docs 2014-10-14 21:59:48 +00:00
Ricardo Cervera-Navarro
0813e29817 Revert "docs: Watermarked images for codes that weren't found." 
Remove easter eggs.

This reverts commit 453df8e6e33f30808ea2244eaa1dd32169996129.

Change-Id: Iaa8c815a876d163c35cc83f3cf4899dd426def7b
 2014-10-14 15:49:07 +00:00
Rich Slogar
858cfad948 am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit 'a3287768e267f71fbce5d3341b6db8f3a9e04230':
  docs:SDK tools 23.0.5 Release Note
 2014-10-10 21:23:51 +00:00
Rich Slogar
a3287768e2 Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 2014-10-10 21:19:08 +00:00
Eric Gilmore
a4eb81b67c am e77fe607: Docs: adding closing bracket to un-break javadoc tokens. 
* commit 'e77fe607609e5a6ea59e11164e21744623cf07a5':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-10 20:49:54 +00:00
Rich Slogar
309b1b384c docs:SDK tools 23.0.5 Release Note 
Change-Id: Ib26f100247d3b8b6f0447251a35fa427393c9938
 2014-10-10 11:19:59 -07:00
Eric Gilmore
e77fe60760 Docs: adding closing bracket to un-break javadoc tokens. 
Bug: 17186958

Change-Id: Ib21120d71ccd7c59536af3d26d7090fc919bec17
 2014-10-09 10:17:59 -07:00
Joe Fernandez
a9d803e0f7 am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'a63f81ec897988befad7b286b50f73a42319fd5e':
  docs: Android TV publishing requirements
 2014-10-09 12:17:00 +00:00
Joe Fernandez
a63f81ec89 am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'e15773be4837baf15079d5d7e8f8c0c09cef952f':
  docs: Android TV publishing requirements
 2014-10-09 12:01:36 +00:00
Joe Fernandez
e15773be48 Merge "docs: Android TV publishing requirements" into klp-modular-docs 2014-10-09 04:19:20 +00:00
Joe Fernandez
1b361d90d3 docs: Android TV publishing requirements 
Change-Id: If1105cb596934034a7156b573c99905bbe6c4978
 2014-10-08 20:56:32 -07:00
smain@google.com
3f0cf028ae am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '63cd4977fd72de401f347ba159a71fe3d04399b3':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 00:09:53 +00:00
smain@google.com
63cd4977fd am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '770c3c5ed52f354fe04ced31aaa56ba57a028955':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 00:04:57 +00:00
smain@google.com
770c3c5ed5 fix unclickable link due to overlay from offset dev below 
Change-Id: I59bedd0e928d578a3bd030caa4add4cfa96db83f
 2014-10-08 16:54:21 -07:00