124628 Commits

Author SHA1 Message Date
Robert Ly
ba10292579 Merge "more doc fixes for notifcations and wear" into klp-modular-dev 2014-06-26 18:07:29 +00:00
Robert Ly
cfcb47c90a Merge "fix reference link" into klp-modular-dev 2014-06-26 18:07:29 +00:00
Robert Ly
2f48339b5e fix reference link
Change-Id: Ia291e04a6404a3732acdbc730a414b71ee5eee89
2014-06-26 11:36:23 -07:00
Robert Ly
99ff245482 fix link
Change-Id: Ic8d7f135e43d1a76c56c5f66245a4a499e1efab1
2014-06-26 11:31:46 -07:00
Robert Ly
495aa4efd7 fix more brokenness
Change-Id: I19c9d6345117825a2bb0504731c358adc7a2f55e
2014-06-26 11:20:57 -07:00
Robert Ly
af19c795e2 Merge "fix gmscore preview isntructions" into klp-modular-dev 2014-06-26 18:07:29 +00:00
Robert Ly
a96b96e7b5 fix gmscore preview isntructions
Change-Id: I58264d2bb608e726d95b64f3cfb829ffff573ea5
2014-06-26 13:16:19 -07:00
Robert Ly
ff0b60068a Merge "fix link" into klp-modular-dev 2014-06-26 18:07:29 +00:00
Robert Ly
174943b39d Merge "fix more brokenness" into klp-modular-dev 2014-06-26 18:07:29 +00:00
smain@google.com
4cf0aa1e42 am 3f423aa1: add missing image and move link for layout
* commit '3f423aa1321f235cb0653bb42a057426237ddd7f':
  add missing image and move link for layout
2014-06-26 17:11:41 +00:00
smain@google.com
3f423aa132 add missing image and move link for layout
Change-Id: I33dff4e2bd48f6eb786a628fb591a9ba7a5cae53
2014-06-26 10:04:49 -07:00
Robert Ly
fd91f17d36 am 7e4af93b: link fixes
* commit '7e4af93be6e1da6c6428f62c7ed71486f82218cd':
  link fixes
2014-06-26 16:54:58 +00:00
Baligh Uddin
e38e6d67fc am 2ceb05a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '2ceb05a6a61d9de4b99408fbad4466fbc9dce548':
  Import translations. DO NOT MERGE
2014-06-26 16:54:54 +00:00
Baligh Uddin
b22ef14f44 am bbf69273: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'bbf69273a7ac6cc95a9b0682d0fe62f3a0afb35f':
  Import translations. DO NOT MERGE
2014-06-26 16:54:50 +00:00
Baligh Uddin
1634e49edf am 9cd24101: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '9cd24101315392d6b58331a7969696ba873103f6':
  Import translations. DO NOT MERGE
2014-06-26 16:54:47 +00:00
Scott Main
ca71e07f06 am 16e5d71b: Merge "Revert "new device family image for design, not photos"" into klp-modular-dev
* commit '16e5d71b6bf78d00680d7e9efaf4e94273941292':
  Revert "new device family image for design, not photos"
2014-06-26 16:54:42 +00:00
Robert Ly
7e4af93be6 link fixes
Change-Id: If91c07663347f485106e926167845ce184f17da2
2014-06-26 09:44:43 -07:00
smain@google.com
1fff0b321c am 152440c6: Merge "new device family image for design, not photos" into klp-modular-dev
* commit '152440c67acace16dc1655a821352b0d69a61562':
  new device family image for design, not photos
2014-06-26 15:55:32 +00:00
smain@google.com
6988c162a3 am 590ee5f9: fix build, remove briefdocs
* commit '590ee5f935139eeceec6ed75f658cb6007f82897':
  fix build, remove briefdocs
2014-06-26 15:55:27 +00:00
smain@google.com
590ee5f935 fix build, remove briefdocs
Change-Id: I94a611f4bdc2b9c7f305727aacf2edbe63b4ece7
2014-06-26 08:31:11 -07:00
Robert Ly
f4c7c271a8 am c34fdb72: docs: add l-preview notifications
* commit 'c34fdb72b70eea142dea4cb75f3a6cc16e70270b':
  docs: add l-preview notifications
2014-06-26 09:50:29 +00:00
Robert Ly
3e9a1368e4 am edd662ff: docs: final changes to index
* commit 'edd662ff667a404969b9f892bdb10ceaa5e2db25':
  docs: final changes to index
2014-06-26 09:50:25 +00:00
Robert Ly
259030cba4 am fa28e8cc: Merge "docs: index landing" into klp-modular-dev
* commit 'fa28e8cc4baa4acc9e6cd3bfc5276b67cd8e86f0':
  docs: index landing
2014-06-26 09:50:19 +00:00
Robert Ly
e0041dc18c am c24e1813: Merge "docs: Added links and release notes for ADT 23, Studio 0.8, SDK Tools" into klp-modular-dev
* commit 'c24e18134ee1155d6ec35837644d940f93039370':
  docs: Added links and release notes for ADT 23, Studio 0.8, SDK Tools
2014-06-26 09:50:15 +00:00
smain@google.com
aaba687d04 am dfb41027: lots of updates to the wear design guide actually decent layout with images
* commit 'dfb4102718dcb87acdf4015dc44ab578f57e945f':
  lots of updates to the wear design guide actually decent layout with images
2014-06-26 09:49:58 +00:00
Robert Ly
c34fdb72b7 docs: add l-preview notifications
Change-Id: I76a4f4c544087bdcef07a7990d5623c4de68a75d
2014-06-26 02:31:40 -07:00
Robert Ly
edd662ff66 docs: final changes to index
Change-Id: I1a9a454937a975f2b2a36ab1132e8bb91dc4059a
2014-06-26 02:06:52 -07:00
Baligh Uddin
bbf69273a7 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-06-26 08:19:24 +00:00
Scott Main
16e5d71b6b Merge "Revert "new device family image for design, not photos"" into klp-modular-dev 2014-06-26 08:19:24 +00:00
Scott Main
8374fdbca1 Revert "new device family image for design, not photos"
This reverts commit 9a5dcb8c44a0f64b4abfd8f2bc19136c42cf1232.

Change-Id: I8bb04608b99358c7a07871cd4adf0de2143d7f3a
2014-06-26 16:10:50 +00:00
smain@google.com
9a5dcb8c44 new device family image for design, not photos
Change-Id: I94350e17c3fe26ede6233d65eda22d1bfc71f970
2014-06-26 01:08:36 -07:00
Baligh Uddin
9cd2410131 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-06-26 05:59:24 +00:00
Baligh Uddin
2ceb05a6a6 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-06-26 05:47:42 +00:00
smain@google.com
152440c67a Merge "new device family image for design, not photos" into klp-modular-dev 2014-06-26 05:47:42 +00:00
smain@google.com
dfb4102718 lots of updates to the wear design guide
actually decent layout with images

Change-Id: I45047158b61d3d8202b0f77e1ff8aea9c57da7c5
2014-06-25 22:03:59 -07:00
Ricardo Cervera
bc71daa161 am a1bc384d: docs: Added GitHub links to the samples
* commit 'a1bc384d22de86fc5d8fac90328fa619a6a3fceb':
  docs: Added GitHub links to the samples
2014-06-26 03:57:44 +00:00
Ricardo Cervera
a1bc384d22 docs: Added GitHub links to the samples
Change-Id: I944844d64396b0ae07e4c55118d4cd960480c5b7
2014-06-25 20:37:33 -07:00
Jason Sams
6b52ca5949 am 89e4c715: am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."
* commit '89e4c715e01f4a2da31a92788547282d699752bf':
  Add check and throw for failed Intrinsic init.
2014-06-26 00:25:28 +00:00
Jason Sams
89e4c715e0 am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."
* commit '7165bd6d7496159b426f072bdf13adfffc917a24':
  Add check and throw for failed Intrinsic init.
2014-06-26 00:20:26 +00:00
Joe Fernandez
7265bc4544 am 50cbb708: am c12a1444: am 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
* commit '50cbb708b4e6a99b92a646fd548058f1ff4e766c':
  docs: fix wear whitelist sign up language to be less confusing
2014-06-25 23:00:33 +00:00
smain@google.com
a91c0f6b47 am 603514ad: am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page
* commit '603514adfc2582e194cf6aed112fd5eab40c529d':
  update wear icons on preview page
2014-06-25 23:00:30 +00:00
destradaa
5c2395a4d2 am 72e18628: Merge branch \'klp-modular-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev
* commit '72e186283fdef7f6ac56409bf52a5748f6a4749c':
2014-06-25 23:00:27 +00:00
Robert Ly
b9abab2f42 am 017ec80f: am d0039968: (-s ours) am 2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs
* commit '017ec80fa1ca1212f9c98dcdbb07d1f0bab938d5':
  docs: add gms core preview hoop-jumping
2014-06-25 23:00:16 +00:00
Joe Fernandez
50cbb708b4 am c12a1444: am 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
* commit 'c12a14442734085f2f1d7f3a38e634331537b08e':
  docs: fix wear whitelist sign up language to be less confusing
2014-06-25 22:55:14 +00:00
smain@google.com
603514adfc am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page
* commit '08eb76f42ed53ea3967a4559d9e60a961f9450b5':
  update wear icons on preview page
2014-06-25 22:55:13 +00:00
destradaa
72e186283f Merge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev 2014-06-25 22:55:07 +00:00
Joe Fernandez
c12a144427 am 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
* commit '52e2416cc72f7d87e2f7f1aa29b7a9cb85ae0c70':
  docs: fix wear whitelist sign up language to be less confusing
2014-06-25 22:49:36 +00:00
smain@google.com
58b170e84a am 8f414479: fix back link for preview nav
* commit '8f414479f91f73c3b8432ca93991ba643b9c846f':
  fix back link for preview nav
2014-06-25 22:32:26 +00:00
smain@google.com
8f414479f9 fix back link for preview nav
Change-Id: I684129ba5c43d49ff52410939e8b034ccc4877ad
2014-06-25 15:19:28 -07:00
Robert Ly
fa8ad32716 am ed929960: Merge "docs: add gcore instructions for preview" into klp-modular-dev
* commit 'ed929960584cba38a81b49cff597dba59d50a0a7':
  docs: add gcore instructions for preview
2014-06-25 21:38:49 +00:00