OSDN Git Service

android-x86/frameworks-base.git
10 years agoresolved conflicts for merge of 4d329a8f to klp-modular-dev-plus-aosp
Robert Ly [Mon, 30 Jun 2014 00:55:24 +0000 (17:55 -0700)]
resolved conflicts for merge of 4d329a8f to klp-modular-dev-plus-aosp

Change-Id: Id8096712bc63fe16f93dca4a7963440e11087f7a

10 years agoam 6fff230d: Merge "docs : fix broken links" into klp-modular-dev
Robert Ly [Sun, 29 Jun 2014 23:42:55 +0000 (23:42 +0000)]
am 6fff230d: Merge "docs : fix broken links" into klp-modular-dev

* commit '6fff230d64b869ec9a3f3bb10ea5ae30b041a85a':
  docs : fix broken links

10 years agoam 50b55d61: docs: update notifications docs
Robert Ly [Sun, 29 Jun 2014 23:42:50 +0000 (23:42 +0000)]
am 50b55d61: docs: update notifications docs

* commit '50b55d61af63098d0b95e38afdc5c381b3373cd6':
  docs: update notifications docs

10 years agodocs: update notifications docs
Robert Ly [Sun, 29 Jun 2014 20:00:11 +0000 (13:00 -0700)]
docs: update notifications docs

Change-Id: I0473c75c31c4012dbb3fc81d155da237f8f1f7fd

10 years agoam 7b5abd15: Merge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev
Scott Main [Sat, 28 Jun 2014 02:39:37 +0000 (02:39 +0000)]
am 7b5abd15: Merge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev

* commit '7b5abd15ab15c9f36783dd00c1953d9cf16c33f7':
  docs: fix L Preview G+ links (permanently)

10 years agoam d2b869d0: revisions to the app structure design guide
smain@google.com [Sat, 28 Jun 2014 02:32:24 +0000 (02:32 +0000)]
am d2b869d0: revisions to the app structure design guide

* commit 'd2b869d052e65958545f2dc49c3eef8ff0066280':
  revisions to the app structure design guide

10 years agoam 4c42ab4b: (-s ours) Merge "Revert "Add api 20 to list used by reference docs....
Robert Ly [Sat, 28 Jun 2014 02:32:19 +0000 (02:32 +0000)]
am 4c42ab4b: (-s ours) Merge "Revert "Add api 20 to list used by reference docs."" into klp-modular-dev

* commit '4c42ab4ba59d75eca4883ece2944c30ca36b760f':
  Revert "Add api 20 to list used by reference docs."

10 years agoam e774eb93: (-s ours) Merge "Add api 20 to list used by reference docs." into klp...
Robert Ly [Sat, 28 Jun 2014 02:26:16 +0000 (02:26 +0000)]
am e774eb93: (-s ours) Merge "Add api 20 to list used by reference docs." into klp-modular-dev

* commit 'e774eb939875c02135c7ce9af8e81322a7c0ab59':
  Add api 20 to list used by reference docs.

10 years agorevisions to the app structure design guide
smain@google.com [Sat, 28 Jun 2014 00:05:32 +0000 (17:05 -0700)]
revisions to the app structure design guide

Change-Id: I15e68e454180b848db81791350ba7985817c0930

10 years agoam 67421351: Merge "fix links to wear downloads" into klp-modular-dev
smain@google.com [Fri, 27 Jun 2014 22:57:57 +0000 (22:57 +0000)]
am 67421351: Merge "fix links to wear downloads" into klp-modular-dev

* commit '67421351cc6fd99aef741bb3bc2599bcb1288d1d':
  fix links to wear downloads

10 years agoam 6ebcfb87: docs: notif image
Robert Ly [Fri, 27 Jun 2014 18:17:19 +0000 (18:17 +0000)]
am 6ebcfb87: docs: notif image

* commit '6ebcfb87b8111ee7110aeade6fba35e1862528da':
  docs: notif image

10 years agodocs: notif image
Robert Ly [Fri, 27 Jun 2014 18:12:04 +0000 (11:12 -0700)]
docs: notif image

Change-Id: I2ee3e1da39297f74c8142875c3e71fb0953f5a46

10 years agoam 137d9da3: Merge "docs: fix images for notifications" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 18:03:41 +0000 (18:03 +0000)]
am 137d9da3: Merge "docs: fix images for notifications" into klp-modular-dev

* commit '137d9da3aab652dccc82f4b5741d1c48b8b6cfe9':
  docs: fix images for notifications

10 years agoam 5627b521: Merge "fix build" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 17:21:18 +0000 (17:21 +0000)]
am 5627b521: Merge "fix build" into klp-modular-dev

* commit '5627b521e058058b2496a076256b727e0635ea88':
  fix build

10 years agoam ba102925: Merge "more doc fixes for notifcations and wear" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 17:13:40 +0000 (17:13 +0000)]
am ba102925: Merge "more doc fixes for notifcations and wear" into klp-modular-dev

* commit 'ba1029257999fbfc6c7741d05cee10b8f2036f2f':
  more doc fixes for notifcations and wear

10 years agoMerge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev
Scott Main [Sat, 28 Jun 2014 02:33:47 +0000 (02:33 +0000)]
Merge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev

10 years agodocs: fix L Preview G+ links (permanently)
Joe Fernandez [Sat, 28 Jun 2014 00:00:59 +0000 (17:00 -0700)]
docs: fix L Preview G+ links (permanently)

Change-Id: I699ae07a977495a23c3cb0f440f90c856bc17a3e

10 years agoMerge "fix build" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 17:16:55 +0000 (17:16 +0000)]
Merge "fix build" into klp-modular-dev

10 years agofix build
Robert Ly [Fri, 27 Jun 2014 17:13:58 +0000 (10:13 -0700)]
fix build

Change-Id: I66278269f8f02358c6d2529ef8839eb1ea42fdc4

10 years agomore doc fixes for notifcations and wear
Robert Ly [Fri, 27 Jun 2014 16:25:42 +0000 (09:25 -0700)]
more doc fixes for notifcations and wear

Change-Id: I9f0d168a8ebafb778924919766910b79504ebf68

10 years agoMerge "Add api 20 to list used by reference docs." into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 22:55:50 +0000 (22:55 +0000)]
Merge "Add api 20 to list used by reference docs." into klp-modular-dev

10 years agoAdd api 20 to list used by reference docs.
Dirk Dougherty [Fri, 27 Jun 2014 22:44:19 +0000 (15:44 -0700)]
Add api 20 to list used by reference docs.

Change-Id: Icdf0e9238846f943db527becde92d38f362a9f32

10 years agoam af19c795: Merge "fix gmscore preview isntructions" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 14:35:28 +0000 (14:35 +0000)]
am af19c795: Merge "fix gmscore preview isntructions" into klp-modular-dev

* commit 'af19c795e275b1e7d16fad351b3a14f74ef29088':
  fix gmscore preview isntructions

10 years agoam 3822bf89: change the G+ community link
smain@google.com [Fri, 27 Jun 2014 01:19:21 +0000 (01:19 +0000)]
am 3822bf89: change the G+ community link

* commit '3822bf8935310f8f94a534b986a2af935336d7e8':
  change the G+ community link

10 years agochange the G+ community link
smain@google.com [Fri, 27 Jun 2014 01:12:51 +0000 (18:12 -0700)]
change the G+ community link

Change-Id: I68d453062232b739c3fdaee193eb9a20cd03d8f8

10 years agoam cf54f881: docs: Replaced image in L Preview material docs
Ricardo Cervera [Fri, 27 Jun 2014 01:03:39 +0000 (01:03 +0000)]
am cf54f881: docs: Replaced image in L Preview material docs

* commit 'cf54f881aced94aec5df3b956cfc6b380cbc6b87':
  docs: Replaced image in L Preview material docs

10 years agodocs: Replaced image in L Preview material docs
Ricardo Cervera [Fri, 27 Jun 2014 00:53:12 +0000 (17:53 -0700)]
docs: Replaced image in L Preview material docs

Change-Id: I7db905f0fc8ae2bf9826d74bc7030d5a41cd2859

10 years agoMerge "docs : fix broken links" into klp-modular-dev
Robert Ly [Sun, 29 Jun 2014 23:40:33 +0000 (23:40 +0000)]
Merge "docs : fix broken links" into klp-modular-dev

10 years agodocs : fix broken links
Robert Ly [Sun, 29 Jun 2014 23:38:21 +0000 (16:38 -0700)]
docs : fix broken links

Change-Id: I75d8cbe8abe904bba44cc64d5557c8e14060cb8a

10 years agoMerge "add API reference docs filtering for level 20" into klp-modular-dev
Robert Ly [Sun, 29 Jun 2014 23:41:08 +0000 (23:41 +0000)]
Merge "add API reference docs filtering for level 20" into klp-modular-dev

10 years agoadd API reference docs filtering for level 20
Robert Ly [Sun, 29 Jun 2014 23:39:06 +0000 (16:39 -0700)]
add API reference docs filtering for level 20

Change-Id: Iaab9d0965511d0394e7be29adb0fbcfd2904b857

10 years agoam bb5a3dfb: Doc change: point to correct plus community for ldp.
Dirk Dougherty [Thu, 26 Jun 2014 21:23:14 +0000 (21:23 +0000)]
am bb5a3dfb: Doc change: point to correct plus community for ldp.

* commit 'bb5a3dfbe858b899a04a0d406639e6602e403376':
  Doc change: point to correct plus community for ldp.

10 years agoDoc change: point to correct plus community for ldp.
Dirk Dougherty [Thu, 26 Jun 2014 21:14:17 +0000 (14:14 -0700)]
Doc change: point to correct plus community for ldp.

Change-Id: I6d22041f3de47ce59d418b492c8c7b2b758c2e05

10 years agoam d3e8c7f1: Doc change: change plus community for ldp.
Dirk Dougherty [Thu, 26 Jun 2014 21:12:42 +0000 (21:12 +0000)]
am d3e8c7f1: Doc change: change plus community for ldp.

* commit 'd3e8c7f19496d6a9ec94c6e7686bd0a6d35f730b':
  Doc change: change plus community for ldp.

10 years agoDoc change: change plus community for ldp.
Dirk Dougherty [Thu, 26 Jun 2014 19:44:24 +0000 (12:44 -0700)]
Doc change: change plus community for ldp.

Change-Id: I4dd149f2e2521f79d526dd89c08afb794fc83361

10 years agoam cfcb47c9: Merge "fix reference link" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:41:33 +0000 (18:41 +0000)]
am cfcb47c9: Merge "fix reference link" into klp-modular-dev

* commit 'cfcb47c90ab2516e6f13cef83b1afe98ffe59e44':
  fix reference link

10 years agoam ff0b6006: Merge "fix link" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:36:37 +0000 (18:36 +0000)]
am ff0b6006: Merge "fix link" into klp-modular-dev

* commit 'ff0b60068ad2f1ee0c9a09afdd4c1ed5abe94b3d':
  fix link

10 years agoam 174943b3: Merge "fix more brokenness" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:28:15 +0000 (18:28 +0000)]
am 174943b3: Merge "fix more brokenness" into klp-modular-dev

* commit '174943b39dd8a2fa3aaed50220304d77f3546333':
  fix more brokenness

10 years agoMerge "Revert "Add api 20 to list used by reference docs."" into klp-modular-dev
Robert Ly [Sat, 28 Jun 2014 00:02:35 +0000 (00:02 +0000)]
Merge "Revert "Add api 20 to list used by reference docs."" into klp-modular-dev

10 years agoRevert "Add api 20 to list used by reference docs."
Dirk Dougherty [Fri, 27 Jun 2014 23:59:52 +0000 (23:59 +0000)]
Revert "Add api 20 to list used by reference docs."

This reverts commit 99296a12c0d9a036518704610be07d3466b7e4b0.

Change-Id: Icf047da4ed344a86d84d1da7892a4303468919ca

10 years agoMerge "fix links to wear downloads" into klp-modular-dev
smain@google.com [Fri, 27 Jun 2014 22:53:11 +0000 (22:53 +0000)]
Merge "fix links to wear downloads" into klp-modular-dev

10 years agofix links to wear downloads
smain@google.com [Fri, 27 Jun 2014 22:49:15 +0000 (15:49 -0700)]
fix links to wear downloads

Change-Id: Ibf8fca2d8f504f0d0c7275851fc6282052043259

10 years agoMerge "docs: fix images for notifications" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 17:59:29 +0000 (17:59 +0000)]
Merge "docs: fix images for notifications" into klp-modular-dev

10 years agodocs: fix images for notifications
Robert Ly [Fri, 27 Jun 2014 17:27:40 +0000 (10:27 -0700)]
docs: fix images for notifications

Change-Id: I8e5bd73c1b00a231fd08c822ccfa349143bd8410

10 years agoMerge "more doc fixes for notifcations and wear" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 17:07:49 +0000 (17:07 +0000)]
Merge "more doc fixes for notifcations and wear" into klp-modular-dev

10 years agoMerge "fix reference link" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:37:36 +0000 (18:37 +0000)]
Merge "fix reference link" into klp-modular-dev

10 years agofix reference link
Robert Ly [Thu, 26 Jun 2014 18:36:23 +0000 (11:36 -0700)]
fix reference link

Change-Id: Ia291e04a6404a3732acdbc730a414b71ee5eee89

10 years agofix link
Robert Ly [Thu, 26 Jun 2014 18:31:46 +0000 (11:31 -0700)]
fix link

Change-Id: Ic8d7f135e43d1a76c56c5f66245a4a499e1efab1

10 years agofix more brokenness
Robert Ly [Thu, 26 Jun 2014 18:18:48 +0000 (11:18 -0700)]
fix more brokenness

Change-Id: I19c9d6345117825a2bb0504731c358adc7a2f55e

10 years agoMerge "fix gmscore preview isntructions" into klp-modular-dev
Robert Ly [Fri, 27 Jun 2014 14:30:41 +0000 (14:30 +0000)]
Merge "fix gmscore preview isntructions" into klp-modular-dev

10 years agofix gmscore preview isntructions
Robert Ly [Thu, 26 Jun 2014 20:00:42 +0000 (13:00 -0700)]
fix gmscore preview isntructions

Change-Id: I58264d2bb608e726d95b64f3cfb829ffff573ea5

10 years agoMerge "fix link" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:32:48 +0000 (18:32 +0000)]
Merge "fix link" into klp-modular-dev

10 years agoMerge "fix more brokenness" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 18:22:09 +0000 (18:22 +0000)]
Merge "fix more brokenness" into klp-modular-dev

10 years agoam 3f423aa1: add missing image and move link for layout
smain@google.com [Thu, 26 Jun 2014 17:11:41 +0000 (17:11 +0000)]
am 3f423aa1: add missing image and move link for layout

* commit '3f423aa1321f235cb0653bb42a057426237ddd7f':
  add missing image and move link for layout

10 years agoadd missing image and move link for layout
smain@google.com [Thu, 26 Jun 2014 17:04:49 +0000 (10:04 -0700)]
add missing image and move link for layout

Change-Id: I33dff4e2bd48f6eb786a628fb591a9ba7a5cae53

10 years agoam 7e4af93b: link fixes
Robert Ly [Thu, 26 Jun 2014 16:54:58 +0000 (16:54 +0000)]
am 7e4af93b: link fixes

* commit '7e4af93be6e1da6c6428f62c7ed71486f82218cd':
  link fixes

10 years agoam 2ceb05a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 26 Jun 2014 16:54:54 +0000 (16:54 +0000)]
am 2ceb05a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '2ceb05a6a61d9de4b99408fbad4466fbc9dce548':
  Import translations. DO NOT MERGE

10 years agoam bbf69273: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 26 Jun 2014 16:54:50 +0000 (16:54 +0000)]
am bbf69273: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'bbf69273a7ac6cc95a9b0682d0fe62f3a0afb35f':
  Import translations. DO NOT MERGE

10 years agoam 9cd24101: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 26 Jun 2014 16:54:47 +0000 (16:54 +0000)]
am 9cd24101: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '9cd24101315392d6b58331a7969696ba873103f6':
  Import translations. DO NOT MERGE

10 years agoam 16e5d71b: Merge "Revert "new device family image for design, not photos"" into...
Scott Main [Thu, 26 Jun 2014 16:54:42 +0000 (16:54 +0000)]
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"

10 years agolink fixes
Robert Ly [Thu, 26 Jun 2014 16:44:43 +0000 (09:44 -0700)]
link fixes

Change-Id: If91c07663347f485106e926167845ce184f17da2

10 years agoam 152440c6: Merge "new device family image for design, not photos" into klp-modular-dev
smain@google.com [Thu, 26 Jun 2014 15:55:32 +0000 (15:55 +0000)]
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

10 years agoam 590ee5f9: fix build, remove briefdocs
smain@google.com [Thu, 26 Jun 2014 15:55:27 +0000 (15:55 +0000)]
am 590ee5f9: fix build, remove briefdocs

* commit '590ee5f935139eeceec6ed75f658cb6007f82897':
  fix build, remove briefdocs

10 years agofix build, remove briefdocs
smain@google.com [Thu, 26 Jun 2014 15:31:11 +0000 (08:31 -0700)]
fix build, remove briefdocs

Change-Id: I94a611f4bdc2b9c7f305727aacf2edbe63b4ece7

10 years agoam c34fdb72: docs: add l-preview notifications
Robert Ly [Thu, 26 Jun 2014 09:50:29 +0000 (09:50 +0000)]
am c34fdb72: docs: add l-preview notifications

* commit 'c34fdb72b70eea142dea4cb75f3a6cc16e70270b':
  docs: add l-preview notifications

10 years agoam edd662ff: docs: final changes to index
Robert Ly [Thu, 26 Jun 2014 09:50:25 +0000 (09:50 +0000)]
am edd662ff: docs: final changes to index

* commit 'edd662ff667a404969b9f892bdb10ceaa5e2db25':
  docs: final changes to index

10 years agoam fa28e8cc: Merge "docs: index landing" into klp-modular-dev
Robert Ly [Thu, 26 Jun 2014 09:50:19 +0000 (09:50 +0000)]
am fa28e8cc: Merge "docs: index landing" into klp-modular-dev

* commit 'fa28e8cc4baa4acc9e6cd3bfc5276b67cd8e86f0':
  docs: index landing

10 years agoam c24e1813: Merge "docs: Added links and release notes for ADT 23, Studio 0.8, SDK...
Robert Ly [Thu, 26 Jun 2014 09:50:15 +0000 (09:50 +0000)]
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

10 years agoam dfb41027: lots of updates to the wear design guide actually decent layout with...
smain@google.com [Thu, 26 Jun 2014 09:49:58 +0000 (09:49 +0000)]
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

10 years agodocs: add l-preview notifications
Robert Ly [Thu, 26 Jun 2014 09:17:12 +0000 (02:17 -0700)]
docs: add l-preview notifications

Change-Id: I76a4f4c544087bdcef07a7990d5623c4de68a75d

10 years agodocs: final changes to index
Robert Ly [Thu, 26 Jun 2014 08:18:05 +0000 (01:18 -0700)]
docs: final changes to index

Change-Id: I1a9a454937a975f2b2a36ab1132e8bb91dc4059a

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 26 Jun 2014 16:17:14 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "Revert "new device family image for design, not photos"" into klp-modular-dev
Scott Main [Thu, 26 Jun 2014 16:11:36 +0000 (16:11 +0000)]
Merge "Revert "new device family image for design, not photos"" into klp-modular-dev

10 years agoRevert "new device family image for design, not photos"
Scott Main [Thu, 26 Jun 2014 16:10:50 +0000 (16:10 +0000)]
Revert "new device family image for design, not photos"

This reverts commit 9a5dcb8c44a0f64b4abfd8f2bc19136c42cf1232.

Change-Id: I8bb04608b99358c7a07871cd4adf0de2143d7f3a

10 years agonew device family image for design, not photos
smain@google.com [Thu, 26 Jun 2014 08:03:55 +0000 (01:03 -0700)]
new device family image for design, not photos

Change-Id: I94350e17c3fe26ede6233d65eda22d1bfc71f970

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 26 Jun 2014 16:17:12 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 26 Jun 2014 16:17:19 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "new device family image for design, not photos" into klp-modular-dev
smain@google.com [Thu, 26 Jun 2014 15:51:37 +0000 (15:51 +0000)]
Merge "new device family image for design, not photos" into klp-modular-dev

10 years agolots of updates to the wear design guide
smain@google.com [Tue, 24 Jun 2014 21:12:45 +0000 (14:12 -0700)]
lots of updates to the wear design guide
actually decent layout with images

Change-Id: I45047158b61d3d8202b0f77e1ff8aea9c57da7c5

10 years agoam a1bc384d: docs: Added GitHub links to the samples
Ricardo Cervera [Thu, 26 Jun 2014 03:57:44 +0000 (03:57 +0000)]
am a1bc384d: docs: Added GitHub links to the samples

* commit 'a1bc384d22de86fc5d8fac90328fa619a6a3fceb':
  docs: Added GitHub links to the samples

10 years agodocs: Added GitHub links to the samples
Ricardo Cervera [Thu, 26 Jun 2014 00:14:03 +0000 (17:14 -0700)]
docs: Added GitHub links to the samples

Change-Id: I944844d64396b0ae07e4c55118d4cd960480c5b7

10 years agoam 89e4c715: am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."
Jason Sams [Thu, 26 Jun 2014 00:25:28 +0000 (00:25 +0000)]
am 89e4c715: am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."

* commit '89e4c715e01f4a2da31a92788547282d699752bf':
  Add check and throw for failed Intrinsic init.

10 years agoam 7165bd6d: Merge "Add check and throw for failed Intrinsic init."
Jason Sams [Thu, 26 Jun 2014 00:20:26 +0000 (00:20 +0000)]
am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."

* commit '7165bd6d7496159b426f072bdf13adfffc917a24':
  Add check and throw for failed Intrinsic init.

10 years agoam 50cbb708: am c12a1444: am 52e2416c: Merge "docs: fix wear whitelist sign up langua...
Joe Fernandez [Wed, 25 Jun 2014 23:00:33 +0000 (23:00 +0000)]
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

10 years agoam 603514ad: am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page
smain@google.com [Wed, 25 Jun 2014 23:00:30 +0000 (23:00 +0000)]
am 603514ad: am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page

* commit '603514adfc2582e194cf6aed112fd5eab40c529d':
  update wear icons on preview page

10 years agoam 72e18628: Merge branch \'klp-modular-dev\' of https://googleplex-android.googlesou...
destradaa [Wed, 25 Jun 2014 23:00:27 +0000 (23:00 +0000)]
am 72e18628: Merge branch \'klp-modular-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev

* commit '72e186283fdef7f6ac56409bf52a5748f6a4749c':

10 years agoam 017ec80f: am d0039968: (-s ours) am 2a139d64: Merge "docs: add gms core preview...
Robert Ly [Wed, 25 Jun 2014 23:00:16 +0000 (23:00 +0000)]
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

10 years agoam c12a1444: am 52e2416c: Merge "docs: fix wear whitelist sign up language to be...
Joe Fernandez [Wed, 25 Jun 2014 22:55:14 +0000 (22:55 +0000)]
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

10 years agoam 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page
smain@google.com [Wed, 25 Jun 2014 22:55:13 +0000 (22:55 +0000)]
am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page

* commit '08eb76f42ed53ea3967a4559d9e60a961f9450b5':
  update wear icons on preview page

10 years agoMerge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct...
destradaa [Wed, 25 Jun 2014 22:55:07 +0000 (22:55 +0000)]
Merge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev

10 years agoam 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing...
Joe Fernandez [Wed, 25 Jun 2014 22:49:36 +0000 (22:49 +0000)]
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

10 years agoam 8f414479: fix back link for preview nav
smain@google.com [Wed, 25 Jun 2014 22:32:26 +0000 (22:32 +0000)]
am 8f414479: fix back link for preview nav

* commit '8f414479f91f73c3b8432ca93991ba643b9c846f':
  fix back link for preview nav

10 years agofix back link for preview nav
smain@google.com [Wed, 25 Jun 2014 22:11:40 +0000 (15:11 -0700)]
fix back link for preview nav

Change-Id: I684129ba5c43d49ff52410939e8b034ccc4877ad

10 years agoam ed929960: Merge "docs: add gcore instructions for preview" into klp-modular-dev
Robert Ly [Wed, 25 Jun 2014 21:38:49 +0000 (21:38 +0000)]
am ed929960: Merge "docs: add gcore instructions for preview" into klp-modular-dev

* commit 'ed929960584cba38a81b49cff597dba59d50a0a7':
  docs: add gcore instructions for preview

10 years agoam 8f832719: Merge "add license wall to downloading the L Preview system images"...
smain@google.com [Wed, 25 Jun 2014 21:28:15 +0000 (21:28 +0000)]
am 8f832719: Merge "add license wall to downloading the L Preview system images" into klp-modular-dev

* commit '8f832719632cdbcbcc555c94f898ddbf38174de9':
  add license wall to downloading the L Preview system images

10 years agoam 54c6e0aa: Merge "Final L-Preview Guidelines for Android TV Games Staged at http...
Joe Fernandez [Wed, 25 Jun 2014 20:53:54 +0000 (20:53 +0000)]
am 54c6e0aa: Merge "Final L-Preview Guidelines for Android TV Games Staged at boku.mtv.corp.google.com:9195/preview/tv/games/index.html" into klp-modular-dev

* commit '54c6e0aa1f27e5ecf3db64710563a305d78e9d39':
  Final L-Preview Guidelines for Android TV Games Staged at http://boku.mtv.corp.google.com:9195/preview/tv/games/index.html

10 years agoam 6d38cec1: am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."
Stephen Hines [Wed, 25 Jun 2014 20:50:26 +0000 (20:50 +0000)]
am 6d38cec1: am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."

* commit '6d38cec12baa98fc50abd033eddd359a66843efa':
  Switch from size_t -> uint32_t for dimensions array.

10 years agoam 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."
Stephen Hines [Wed, 25 Jun 2014 20:44:09 +0000 (20:44 +0000)]
am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."

* commit '924ed1fae19ba70b5c6267b977ae8c72b63fe99a':
  Switch from size_t -> uint32_t for dimensions array.

10 years agoam d0039968: (-s ours) am 2a139d64: Merge "docs: add gms core preview hoop-jumping...
Robert Ly [Wed, 25 Jun 2014 19:29:45 +0000 (19:29 +0000)]
am d0039968: (-s ours) am 2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs

* commit 'd0039968fa6caafcbb39e9613af75686a2f1ce46':
  docs: add gms core preview hoop-jumping

10 years agoam d9d9d335: am 80c07fb9: am ec6f162f: DO NOT MERGE!
smain@google.com [Wed, 25 Jun 2014 19:25:30 +0000 (19:25 +0000)]
am d9d9d335: am 80c07fb9: am ec6f162f: DO NOT MERGE!

* commit 'd9d9d335fbd88d77ad10f5850e824c72c85bcfb0':
  DO NOT MERGE!