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

7549 Commits

Author SHA1 Message Date
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
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
Quddus Chong
581d03b1d5 am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '9df3d67bdc7c1fa79d0daab1f2ae5f69a476f8dd':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-08 18:06:24 +00:00
Quddus Chong
9df3d67bdc am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '7f567e4a1c561f60c6d31f6709508f5ec5a6ba88':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-08 18:01:05 +00:00
Quddus Chong
7f567e4a1c docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
Change-Id: I710c0eab6913988d8bc70ded344a2d60fa594d92
 2014-10-08 10:51:21 -07:00
Joe Fernandez
37ec657011 am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 
* commit '59c04ece5614ffa20e10964a70c5faeafe565aa3':
  docs: Wear UI Lib training fixes
 2014-10-08 14:50:15 +00:00
Joe Fernandez
59c04ece56 am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 
* commit 'bcd1af39fa674dcc46ddb30778304eaf67100a13':
  docs: Wear UI Lib training fixes
 2014-10-08 14:45:59 +00:00
Joe Fernandez
bcd1af39fa Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 2014-10-08 14:37:35 +00:00
Rich Slogar
9779c905ea am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs 
* commit '916a6ea30377730d578692b625b1c18aa9f13564':
  docs:64 bit image and skd update
 2014-10-08 00:39:25 +00:00
Rich Slogar
916a6ea303 am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs 
* commit '6af8fc7f89cb5dec15c23ee04c271188ff11138d':
  docs:64 bit image and skd update
 2014-10-08 00:34:38 +00:00
Rich Slogar
6af8fc7f89 Merge "docs:64 bit image and skd update" into klp-modular-docs 2014-10-08 00:31:43 +00:00
Quddus Chong
dfb86b994f am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 
* commit 'bb5a18487285455131b88caf4a40726f0e4b444c':
  docs: Added API highlights for Google Play services 6.1 (Manchego).
 2014-10-07 23:37:44 +00:00
Quddus Chong
9566bd2339 am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs 
* commit 'bf29d697803e3fe0bcb450d2e5b36d0a75cc1148':
  Updataed Google Play services Javadocs for v6.1 (Manchego) release.
 2014-10-07 23:37:36 +00:00
Quddus Chong
bb5a184872 am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 
* commit '8730092af798d27b9e9a9a4ba00cef0d3ebea55f':
  docs: Added API highlights for Google Play services 6.1 (Manchego).
 2014-10-07 23:33:10 +00:00
Quddus Chong
bf29d69780 am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs 
* commit '6628e602fb616355db8272a697a7004d91f485b8':
  Updataed Google Play services Javadocs for v6.1 (Manchego) release.
 2014-10-07 23:33:03 +00:00
Quddus Chong
8730092af7 Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 2014-10-07 23:27:02 +00:00
Quddus Chong
6628e602fb Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs 2014-10-07 23:26:49 +00:00
Ricardo Cervera
5f9d680dd7 am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. 
* commit 'a18075e82b603762382232816c0d74abcc7e46e7':
  docs: Removing references to self note on Common Intents page.
 2014-10-07 18:43:25 +00:00
Rich Slogar
1b0fba6478 docs:64 bit image and skd update 
Change-Id: I53d3d8e8714cb4689ba80766b155fb1b3ea93484
 2014-10-07 11:40:27 -07:00
Ricardo Cervera
a18075e82b am bd964cad: docs: Removing references to self note on Common Intents page. 
* commit 'bd964cadd4846d5d954eadb7fcd2a61e51814c65':
  docs: Removing references to self note on Common Intents page.
 2014-10-07 18:38:24 +00:00
Ricardo Cervera
bd964cadd4 docs: Removing references to self note on Common Intents page. 
Change-Id: Ia1324f2363ce66ad0019946605a6a74a4cd28ecc
 2014-10-07 10:37:19 -07:00
Ricardo Cervera
a6abe30397 am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '6d30f576146725ee81b8cb753584985a2758b566':
  docs: Update Common Intents page with Google Now actions
 2014-10-07 04:56:47 +00:00
Ricardo Cervera
6d30f57614 am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '3f7b4d8ff385ce30c6c266f8b0418fc621db2da8':
  docs: Update Common Intents page with Google Now actions
 2014-10-07 04:49:17 +00:00
Ricardo Cervera
3f7b4d8ff3 Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 2014-10-07 04:41:13 +00:00