OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 7a2df74b: am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp...
Vinod Krishnan [Thu, 19 Mar 2015 09:48:03 +0000 (09:48 +0000)]
am 7a2df74b: am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev

* commit '7a2df74b1124746fa5400d3ed5e6e3680c8f3601':
  Make Theme.Micro point to Theme.Material

9 years agoam 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
Vinod Krishnan [Thu, 19 Mar 2015 09:42:46 +0000 (09:42 +0000)]
am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev

* commit '3f782ad156d337c7c6c542696ddc67ae82fa7a84':
  Make Theme.Micro point to Theme.Material

9 years agoMerge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
Vinod Krishnan [Thu, 19 Mar 2015 09:36:36 +0000 (09:36 +0000)]
Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev

9 years agoMerge "Make sure shaders use a color model compatible with the destination."
Diego Perez [Thu, 19 Mar 2015 09:22:24 +0000 (09:22 +0000)]
Merge "Make sure shaders use a color model compatible with the destination."

9 years agoAdd DO policy to disable safe boot mode.
Benjamin Franz [Thu, 5 Mar 2015 18:33:51 +0000 (18:33 +0000)]
Add DO policy to disable safe boot mode.

Bug: 19615843
Change-Id: I14dbe911995ec216c57bd285d6b7b04c9684591a

9 years agoam e7114123: am bf6b1e00: am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am...
Joe Fernandez [Thu, 19 Mar 2015 06:04:27 +0000 (06:04 +0000)]
am e7114123: am bf6b1e00: am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'e711412302a9e84bf14d772795a8ec58537926b9':
  docs: updated Auto training landing page

9 years agoam bf6b1e00: am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge...
Joe Fernandez [Thu, 19 Mar 2015 05:56:57 +0000 (05:56 +0000)]
am bf6b1e00: am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'bf6b1e00f1981061f5a11dffdb2cf2bf58792e4a':
  docs: updated Auto training landing page

9 years agoam ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated...
Joe Fernandez [Thu, 19 Mar 2015 05:52:21 +0000 (05:52 +0000)]
am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'ebaf79018b5bcfbe83f5877d5360a1c0d46d0b97':
  docs: updated Auto training landing page

9 years agoam cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto trainin...
Joe Fernandez [Thu, 19 Mar 2015 05:44:33 +0000 (05:44 +0000)]
am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'cbdfa09fc56995c8c99e8684b8c52e4f9d247a50':
  docs: updated Auto training landing page

9 years agoam fd711bec: am 99842c00: am 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am...
Joe Fernandez [Thu, 19 Mar 2015 05:44:24 +0000 (05:44 +0000)]
am fd711bec: am 99842c00: am 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

* commit 'fd711bec497b60a518623f94cb30b37da976bfa0':
  Revert "Doc change: add docs for SafetyNet API."

9 years agoam 635d302a: am af1fd4e2: am 7a7f8927: am 1e474aee: am 1eba366d: am 507cfedd: am...
Joe Fernandez [Thu, 19 Mar 2015 05:44:16 +0000 (05:44 +0000)]
am 635d302a: am af1fd4e2: am 7a7f8927: am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK relea

* commit '635d302a9dc3028b40b893229fbbd2b48c153bc0':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

9 years agoam e6bd00f3: am a3c2ca61: am f038ffd7: am 6f3caae9: am 055ec1f9: am f7497b46: am...
Joe Fernandez [Thu, 19 Mar 2015 05:43:58 +0000 (05:43 +0000)]
am e6bd00f3: am a3c2ca61: am f038ffd7: am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

* commit 'e6bd00f399759625ee41b046659b1f1eb67372f7':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

9 years agoam 99842c00: am 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge...
Joe Fernandez [Thu, 19 Mar 2015 05:38:48 +0000 (05:38 +0000)]
am 99842c00: am 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

* commit '99842c0018241ca3c0ec05c88dc57a21f24fb405':
  Revert "Doc change: add docs for SafetyNet API."

9 years agoam af1fd4e2: am 7a7f8927: am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge...
Joe Fernandez [Thu, 19 Mar 2015 05:38:41 +0000 (05:38 +0000)]
am af1fd4e2: am 7a7f8927: am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lm

* commit 'af1fd4e28de6cb39647a52e66887584e3a44991d':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

9 years agoam a3c2ca61: am f038ffd7: am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge...
Joe Fernandez [Thu, 19 Mar 2015 05:38:34 +0000 (05:38 +0000)]
am a3c2ca61: am f038ffd7: am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

* commit 'a3c2ca6140b5a460fbd96618b2065066d8c2ccc8':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

9 years agoam f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing...
Joe Fernandez [Thu, 19 Mar 2015 05:37:09 +0000 (05:37 +0000)]
am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'f8b9e92b647f247d38e02ed3cf66bdc8cf08bc1c':
  docs: updated Auto training landing page

9 years agoam ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp...
Joe Fernandez [Thu, 19 Mar 2015 05:31:20 +0000 (05:31 +0000)]
am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'ae4542578ef50122bb3cd3a8334a20314957e318':
  docs: updated Auto training landing page

9 years agoam 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc...
Joe Fernandez [Thu, 19 Mar 2015 05:31:11 +0000 (05:31 +0000)]
am 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

* commit '7e7f3658b90da46ae8b44577420ebd6ee0e9ffa1':
  Revert "Doc change: add docs for SafetyNet API."

9 years agoam 7a7f8927: am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs...
Joe Fernandez [Thu, 19 Mar 2015 05:31:04 +0000 (05:31 +0000)]
am 7a7f8927: am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs

* commit '7a7f89271e7fc1a6c3c881a1cb56dc88d9958f7a':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

9 years agoam f038ffd7: am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs...
Joe Fernandez [Thu, 19 Mar 2015 05:30:58 +0000 (05:30 +0000)]
am f038ffd7: am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

* commit 'f038ffd7992c5e0c46fb1de6b42e747b1999bfdf':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

9 years agoam 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add...
Joe Fernandez [Thu, 19 Mar 2015 05:24:43 +0000 (05:24 +0000)]
am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

* commit '2e0f6b10e2d0a9d1dc8321e4aaedde148a87bc44':
  Revert "Doc change: add docs for SafetyNet API."

9 years agoam 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated...
Joe Fernandez [Thu, 19 Mar 2015 05:24:37 +0000 (05:24 +0000)]
am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs

* commit '1e474aeeb55a3d2ff79b6803813ba36469f3a463':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

9 years agoam 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd...
Joe Fernandez [Thu, 19 Mar 2015 05:24:32 +0000 (05:24 +0000)]
am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

* commit '6f3caae9f016666815d6bfc7daa9db13d13b6cef':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

9 years agoam b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 05:23:30 +0000 (05:23 +0000)]
am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'b67971b512d95d5d9befb9d95417f9c3d8cb3a44':
  docs: updated Auto training landing page

9 years agoMerge "docs: updated Auto training landing page" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 05:19:21 +0000 (05:19 +0000)]
Merge "docs: updated Auto training landing page" into lmp-docs

9 years agoam 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for Safety...
Joe Fernandez [Thu, 19 Mar 2015 05:18:15 +0000 (05:18 +0000)]
am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

* commit '9bb7e2e77c6b8dd3d729cddf23194142cf1035e4':
  Revert "Doc change: add docs for SafetyNet API."

9 years agoam 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New...
Joe Fernandez [Thu, 19 Mar 2015 05:18:01 +0000 (05:18 +0000)]
am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs

* commit '1eba366dce4b38e849e9faaf99c5bd3f7de2d6a8':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

9 years agoam 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs...
Joe Fernandez [Thu, 19 Mar 2015 05:17:54 +0000 (05:17 +0000)]
am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

* commit '055ec1f94f90bd3f87e0b48d5438953420b22c3f':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

9 years agoam f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API....
Joe Fernandez [Thu, 19 Mar 2015 05:11:27 +0000 (05:11 +0000)]
am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

* commit 'f23167fc8faa03f16a5597acb463393a5ec14af5':
  Revert "Doc change: add docs for SafetyNet API."

9 years agoam 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google...
Joe Fernandez [Thu, 19 Mar 2015 05:11:23 +0000 (05:11 +0000)]
am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs

* commit '507cfedde978dea45cc646fd391c5a12ff55e9cd':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

9 years agoam f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google...
Joe Fernandez [Thu, 19 Mar 2015 05:11:18 +0000 (05:11 +0000)]
am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

* commit 'f7497b46366054274eca1a81e7f74b0e61d7ffe5':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

9 years agodocs: updated Auto training landing page
Joe Fernandez [Sat, 7 Mar 2015 00:08:13 +0000 (16:08 -0800)]
docs: updated Auto training landing page

Change-Id: I407681892071b82523c5533539c777f77a8dd429

9 years agoam 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 05:05:08 +0000 (05:05 +0000)]
am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

* commit '4189bd99572a8dfa4a84e05a03a6d87d794d2e36':
  Revert "Doc change: add docs for SafetyNet API."

9 years agoam 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services...
Joe Fernandez [Thu, 19 Mar 2015 05:05:04 +0000 (05:05 +0000)]
am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs

* commit '5a5e6a37011795135b7ebbaf4ae5645d72f8f147':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

9 years agoam ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services...
Joe Fernandez [Thu, 19 Mar 2015 05:04:58 +0000 (05:04 +0000)]
am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

* commit 'ceb10eac8ec07be00a3eca68ea1be68cb5ebc78c':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

9 years agoMerge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 05:00:45 +0000 (05:00 +0000)]
Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

9 years agoMerge "Revert "docs: Updated 'What's New' in Google Play services doc to reflect...
Joe Fernandez [Thu, 19 Mar 2015 05:00:03 +0000 (05:00 +0000)]
Merge "Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs

9 years agoMerge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla...
Joe Fernandez [Thu, 19 Mar 2015 04:58:17 +0000 (04:58 +0000)]
Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

9 years agoRevert "Doc change: add docs for SafetyNet API."
Joe Fernandez [Thu, 19 Mar 2015 04:55:05 +0000 (04:55 +0000)]
Revert "Doc change: add docs for SafetyNet API."

Reason: Android Auto needs to release ahead of Orla which is delayed.
This change is in the way, right now, but will be re-submitted.

This reverts commit 11e80575660e81d7e053d7fce604bf421ca2f3ce.

Change-Id: I6661e1e780ce8aee9bdaed82fcff4f96fc3349e7

9 years agoRevert "docs: Updated 'What's New' in Google Play services doc to reflect changes...
Joe Fernandez [Thu, 19 Mar 2015 04:51:17 +0000 (04:51 +0000)]
Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

This reverts commit b2a6185e259c2e9bbb48d729563263cf7234a837.

Change-Id: I64f49cba3a87fe0f6a9db12a68d8a0064810a1d8

9 years agoRevert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generate...
Joe Fernandez [Thu, 19 Mar 2015 04:49:40 +0000 (04:49 +0000)]
Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

This reverts commit 180b835480b113e497268243a12cb2c244d9559e.

Change-Id: Ibcefe65a1a7829b8b424763aba636300665a7f7b

9 years agoMerge "Add voicemail builder method for updating/syncing."
Nancy Chen [Thu, 19 Mar 2015 03:50:45 +0000 (03:50 +0000)]
Merge "Add voicemail builder method for updating/syncing."

9 years agoAdd voicemail builder method for updating/syncing.
Nancy Chen [Sat, 14 Mar 2015 00:29:40 +0000 (17:29 -0700)]
Add voicemail builder method for updating/syncing.

The id of the voicemail is necessary to update a voicemail in the
database and the source data (or unique remote identifier for the
voicemail) is necessary for syncing remotely. Whenever performing a sync
either of data to the server or vise versa, create a voicemail object
using this new method.

Bug: 19236241
Change-Id: Ibc1fd8c1922be13605987d9a3dcd327c438951c8

9 years agoam 55192a2f: am efd0131b: am bdf8e26e: am 5994206b: am cdf13080: am ed657981: am...
Joe Fernandez [Thu, 19 Mar 2015 03:16:58 +0000 (03:16 +0000)]
am 55192a2f: am efd0131b: am bdf8e26e: am 5994206b: am cdf13080: am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs

* commit '55192a2f902f2ebd6ae0c145f0be20b7ff1fd78a':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819

9 years agoam ecef2964: am 51b34999: am 8e211e86: am cd9cd187: am e31c9048: am 462dc7b9: am...
Joe Fernandez [Thu, 19 Mar 2015 03:16:50 +0000 (03:16 +0000)]
am ecef2964: am 51b34999: am 8e211e86: am cd9cd187: am e31c9048: am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs

* commit 'ecef296420d9374626134bb32f63b50757e00e71':
  docs: Add distribution guidelines and update quality checklist for Android Auto.

9 years agoam dfc5a2a8: am 2495aabe: am 6bf1017e: am 348a8b85: am d2484a8a: am 26e332bf: am...
Joe Fernandez [Thu, 19 Mar 2015 03:16:40 +0000 (03:16 +0000)]
am dfc5a2a8: am 2495aabe: am 6bf1017e: am 348a8b85: am d2484a8a: am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs

* commit 'dfc5a2a8f1b00c6524d7c562dd4ac561e1035b6c':
  Doc change: add docs for SafetyNet API.

9 years agoam b4407ae0: am 44edfdf3: am e3678fc6: am e5856e6b: am c63471ad: am 51aa424a: am...
Quddus Chong [Thu, 19 Mar 2015 03:16:32 +0000 (03:16 +0000)]
am b4407ae0: am 44edfdf3: am e3678fc6: am e5856e6b: am c63471ad: am 51aa424a: am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." int

* commit 'b4407ae000eb02b5d950bdf643bcc88c7bb2cc99':
  docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.

9 years agoam 1a36a65c: am 014f14e5: am a1c36660: am 48612f9d: am 5192ac8d: am f990241a: am...
Quddus Chong [Thu, 19 Mar 2015 03:16:15 +0000 (03:16 +0000)]
am 1a36a65c: am 014f14e5: am a1c36660: am 48612f9d: am 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs

* commit '1a36a65c541932bb2af6ebf50f29463b92c0ddcf':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.

9 years agoam efd0131b: am bdf8e26e: am 5994206b: am cdf13080: am ed657981: am 59d6c8bd: Merge...
Joe Fernandez [Thu, 19 Mar 2015 03:08:58 +0000 (03:08 +0000)]
am efd0131b: am bdf8e26e: am 5994206b: am cdf13080: am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs

* commit 'efd0131b9f233c8ef4ac817cc51a310b3243f04f':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819

9 years agoam 51b34999: am 8e211e86: am cd9cd187: am e31c9048: am 462dc7b9: am cb92819f: Merge...
Joe Fernandez [Thu, 19 Mar 2015 03:08:52 +0000 (03:08 +0000)]
am 51b34999: am 8e211e86: am cd9cd187: am e31c9048: am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs

* commit '51b349992b66c85666b67a33c47e1309719d86b5':
  docs: Add distribution guidelines and update quality checklist for Android Auto.

9 years agoam 2495aabe: am 6bf1017e: am 348a8b85: am d2484a8a: am 26e332bf: am 3bbb646b: Merge...
Joe Fernandez [Thu, 19 Mar 2015 03:08:46 +0000 (03:08 +0000)]
am 2495aabe: am 6bf1017e: am 348a8b85: am d2484a8a: am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs

* commit '2495aabec00082c5a27d368da63364c31d58f37a':
  Doc change: add docs for SafetyNet API.

9 years agoam 44edfdf3: am e3678fc6: am e5856e6b: am c63471ad: am 51aa424a: am 9b278f56: Merge...
Quddus Chong [Thu, 19 Mar 2015 03:08:40 +0000 (03:08 +0000)]
am 44edfdf3: am e3678fc6: am e5856e6b: am c63471ad: am 51aa424a: am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs

* commit '44edfdf345757f38376558842a6f57160f8608bd':
  docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.

9 years agoam 014f14e5: am a1c36660: am 48612f9d: am 5192ac8d: am f990241a: am abde3d83: Merge...
Quddus Chong [Thu, 19 Mar 2015 03:08:32 +0000 (03:08 +0000)]
am 014f14e5: am a1c36660: am 48612f9d: am 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs

* commit '014f14e500d5c9d24bf969a1744f067467067e11':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.

9 years agoam bdf8e26e: am 5994206b: am cdf13080: am ed657981: am 59d6c8bd: Merge "cherrypick...
Joe Fernandez [Thu, 19 Mar 2015 03:01:10 +0000 (03:01 +0000)]
am bdf8e26e: am 5994206b: am cdf13080: am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs

* commit 'bdf8e26e92dd4151619e6844f8f496de768d04c3':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819

9 years agoam 8e211e86: am cd9cd187: am e31c9048: am 462dc7b9: am cb92819f: Merge "docs: Add...
Joe Fernandez [Thu, 19 Mar 2015 03:01:06 +0000 (03:01 +0000)]
am 8e211e86: am cd9cd187: am e31c9048: am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs

* commit '8e211e8632780ce18cff2f65966dac9fee6f3f92':
  docs: Add distribution guidelines and update quality checklist for Android Auto.

9 years agoam 6bf1017e: am 348a8b85: am d2484a8a: am 26e332bf: am 3bbb646b: Merge "Doc change...
Joe Fernandez [Thu, 19 Mar 2015 03:01:02 +0000 (03:01 +0000)]
am 6bf1017e: am 348a8b85: am d2484a8a: am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs

* commit '6bf1017e0746bae6991bcddde494a247c031b1f2':
  Doc change: add docs for SafetyNet API.

9 years agoam e3678fc6: am e5856e6b: am c63471ad: am 51aa424a: am 9b278f56: Merge "docs: Updated...
Quddus Chong [Thu, 19 Mar 2015 03:00:58 +0000 (03:00 +0000)]
am e3678fc6: am e5856e6b: am c63471ad: am 51aa424a: am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs

* commit 'e3678fc6def8e9354378b0463de2ec47a93080c6':
  docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.

9 years agoam a1c36660: am 48612f9d: am 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added...
Quddus Chong [Thu, 19 Mar 2015 03:00:52 +0000 (03:00 +0000)]
am a1c36660: am 48612f9d: am 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs

* commit 'a1c36660a98793509d995a3521d06a9cad650339':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.

9 years agoam 5994206b: am cdf13080: am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs...
Joe Fernandez [Thu, 19 Mar 2015 02:51:11 +0000 (02:51 +0000)]
am 5994206b: am cdf13080: am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs

* commit '5994206b99584560bc8fdd14111d592f83746b45':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819

9 years agoam cd9cd187: am e31c9048: am 462dc7b9: am cb92819f: Merge "docs: Add distribution...
Joe Fernandez [Thu, 19 Mar 2015 02:51:06 +0000 (02:51 +0000)]
am cd9cd187: am e31c9048: am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs

* commit 'cd9cd18783e658c9ef43349705599c5cbcd98f43':
  docs: Add distribution guidelines and update quality checklist for Android Auto.

9 years agoam 348a8b85: am d2484a8a: am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for...
Joe Fernandez [Thu, 19 Mar 2015 02:51:00 +0000 (02:51 +0000)]
am 348a8b85: am d2484a8a: am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs

* commit '348a8b856d99e503dc3765bbe3b32f2edc2f049f':
  Doc change: add docs for SafetyNet API.

9 years agoam e5856e6b: am c63471ad: am 51aa424a: am 9b278f56: Merge "docs: Updated \'What\...
Quddus Chong [Thu, 19 Mar 2015 02:50:56 +0000 (02:50 +0000)]
am e5856e6b: am c63471ad: am 51aa424a: am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs

* commit 'e5856e6b2ce1cb6a4c15d1ae5ee786ac1ec2012b':
  docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.

9 years agoam 48612f9d: am 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added 3rd party...
Quddus Chong [Thu, 19 Mar 2015 02:50:49 +0000 (02:50 +0000)]
am 48612f9d: am 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs

* commit '48612f9d4b1699483b22226096d0dbeb1cb23817':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.

9 years agoam cdf13080: am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update...
Joe Fernandez [Thu, 19 Mar 2015 02:37:23 +0000 (02:37 +0000)]
am cdf13080: am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs

* commit 'cdf130800b46ddd8d3bf88e7788b2c6de3e228dc':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819

9 years agoam e31c9048: am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and...
Joe Fernandez [Thu, 19 Mar 2015 02:37:18 +0000 (02:37 +0000)]
am e31c9048: am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs

* commit 'e31c90483147bdf73247edfdeafe1e4d0549543d':
  docs: Add distribution guidelines and update quality checklist for Android Auto.

9 years agoam d2484a8a: am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet...
Joe Fernandez [Thu, 19 Mar 2015 02:37:00 +0000 (02:37 +0000)]
am d2484a8a: am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs

* commit 'd2484a8a53017ac6137d9caec3d287d75c0868eb':
  Doc change: add docs for SafetyNet API.

9 years agoam c63471ad: am 51aa424a: am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google...
Quddus Chong [Thu, 19 Mar 2015 02:36:56 +0000 (02:36 +0000)]
am c63471ad: am 51aa424a: am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs

* commit 'c63471ade6a136259f1bdc88beb5f10268f26cb0':
  docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.

9 years agoam 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for...
Quddus Chong [Thu, 19 Mar 2015 02:36:50 +0000 (02:36 +0000)]
am 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs

* commit '5192ac8d0652e0b0fc442325af393d34d30dfba7':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.

9 years agoam d28452bb: am 429f894a: am ae1cf011: am b08f2078: am 3f7f78c6: am 27853819: am...
Andrew Solovay [Thu, 19 Mar 2015 01:58:50 +0000 (01:58 +0000)]
am d28452bb: am 429f894a: am ae1cf011: am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs

* commit 'd28452bb9c7af6abd857de51e640c0c3ea76650e':
  docs: Removed sentence fragments.

9 years agoam 6bb34ef5: am 93ffb863: am b489a6d1: am cf34a6d1: am 46bda6a4: am 6fd36f11: am...
Andrew Solovay [Thu, 19 Mar 2015 01:58:42 +0000 (01:58 +0000)]
am 6bb34ef5: am 93ffb863: am b489a6d1: am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs

* commit '6bb34ef53860de39e143848752600f4c91415376':
  docs: Fixed typo (spurious quotation mark).

9 years agoam 164dd96e: am 11891570: am 006d7512: am a0141748: am 42f966c9: am dbec5ae6: am...
Andrew Solovay [Thu, 19 Mar 2015 01:57:28 +0000 (01:57 +0000)]
am 164dd96e: am 11891570: am 006d7512: am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

* commit '164dd96eec5369652594c560e076bcf12e6416f7':
  docs: Fixed broken image link, and broke long lines in code samples

9 years agoMerge "Replace usages of deprecated Resources.getColor() and getColorStateList()"
Alan Viverette [Thu, 19 Mar 2015 01:54:08 +0000 (01:54 +0000)]
Merge "Replace usages of deprecated Resources.getColor() and getColorStateList()"

9 years agoam 429f894a: am ae1cf011: am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge...
Andrew Solovay [Thu, 19 Mar 2015 01:49:11 +0000 (01:49 +0000)]
am 429f894a: am ae1cf011: am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs

* commit '429f894a70840c9debcb2a2730bde2e0b34eb324':
  docs: Removed sentence fragments.

9 years agoam 93ffb863: am b489a6d1: am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge...
Andrew Solovay [Thu, 19 Mar 2015 01:49:05 +0000 (01:49 +0000)]
am 93ffb863: am b489a6d1: am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs

* commit '93ffb8633751c398b79ac894f741a0b745b3fc3d':
  docs: Fixed typo (spurious quotation mark).

9 years agoam 11891570: am 006d7512: am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge...
Andrew Solovay [Thu, 19 Mar 2015 01:49:00 +0000 (01:49 +0000)]
am 11891570: am 006d7512: am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

* commit '118915706ea9f52e503bc82bf616da438eaad65e':
  docs: Fixed broken image link, and broke long lines in code samples

9 years agoam ae1cf011: am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed...
Andrew Solovay [Thu, 19 Mar 2015 01:42:56 +0000 (01:42 +0000)]
am ae1cf011: am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs

* commit 'ae1cf011b4c168e3ebce101a29867aab7c658a3a':
  docs: Removed sentence fragments.

9 years agoam b489a6d1: am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed...
Andrew Solovay [Thu, 19 Mar 2015 01:42:52 +0000 (01:42 +0000)]
am b489a6d1: am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs

* commit 'b489a6d14fbc3f7e7cf1eb0c224da1078a59f23b':
  docs: Fixed typo (spurious quotation mark).

9 years agoam 006d7512: am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed...
Andrew Solovay [Thu, 19 Mar 2015 01:42:48 +0000 (01:42 +0000)]
am 006d7512: am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

* commit '006d751215ca601952a1b52f9b54c3750f4903da':
  docs: Fixed broken image link, and broke long lines in code samples

9 years agoReplace usages of deprecated Resources.getColor() and getColorStateList()
Alan Viverette [Thu, 19 Mar 2015 01:37:18 +0000 (18:37 -0700)]
Replace usages of deprecated Resources.getColor() and getColorStateList()

Change-Id: I8f64fe6c4c44a92ff6d07250223ba590a1d691b0

9 years agoam b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence...
Andrew Solovay [Thu, 19 Mar 2015 01:26:09 +0000 (01:26 +0000)]
am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs

* commit 'b08f20787c793c79d2031a34824dbfa5be4a602c':
  docs: Removed sentence fragments.

9 years agoam cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious...
Andrew Solovay [Thu, 19 Mar 2015 01:26:04 +0000 (01:26 +0000)]
am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs

* commit 'cf34a6d1a19853fe156bf14abcb40a01a380de79':
  docs: Fixed typo (spurious quotation mark).

9 years agoam a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image...
Andrew Solovay [Thu, 19 Mar 2015 01:25:57 +0000 (01:25 +0000)]
am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

* commit 'a01417485279a486df31f8666b037b6f15d7f935':
  docs: Fixed broken image link, and broke long lines in code samples

9 years agoMerge "Use glops for text rendering"
Chris Craik [Thu, 19 Mar 2015 01:02:24 +0000 (01:02 +0000)]
Merge "Use glops for text rendering"

9 years agoam 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments."...
Andrew Solovay [Thu, 19 Mar 2015 00:55:12 +0000 (00:55 +0000)]
am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs

* commit '3f7f78c6518f93b694bd868d406c755e2469584c':
  docs: Removed sentence fragments.

9 years agoam 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation...
Andrew Solovay [Thu, 19 Mar 2015 00:55:08 +0000 (00:55 +0000)]
am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs

* commit '46bda6a4838e592fd3cc0d9334ae92cdc7434f3e':
  docs: Fixed typo (spurious quotation mark).

9 years agoam 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and...
Andrew Solovay [Thu, 19 Mar 2015 00:55:01 +0000 (00:55 +0000)]
am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

* commit '42f966c9df6ed4e7903e87ad557d63ed81da2986':
  docs: Fixed broken image link, and broke long lines in code samples

9 years agoam 1bed39a5: am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."
Shawn Willden [Thu, 19 Mar 2015 00:48:02 +0000 (00:48 +0000)]
am 1bed39a5: am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."

* commit '1bed39a5e4d57e4735e72a1e9765dcec62035b40':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.

9 years agoam 615f39f9: am 254c58c4: Merge changes Id9a22ad3,I629ab2c4
Shawn Willden [Thu, 19 Mar 2015 00:47:54 +0000 (00:47 +0000)]
am 615f39f9: am 254c58c4: Merge changes Id9a22ad3,I629ab2c4

* commit '615f39f911cdc4201b4e1c63c79ae1819a6645ea':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.

9 years agoam e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."
Shawn Willden [Thu, 19 Mar 2015 00:42:09 +0000 (00:42 +0000)]
am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."

* commit 'e921b8a28f0d5b69fbb30374241c62fa90e92013':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.

9 years agoam 254c58c4: Merge changes Id9a22ad3,I629ab2c4
Shawn Willden [Thu, 19 Mar 2015 00:41:58 +0000 (00:41 +0000)]
am 254c58c4: Merge changes Id9a22ad3,I629ab2c4

* commit '254c58c4e760e0af132d680fbd783a38ef436435':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.

9 years agoam 8b8a0451: am 8bc23e82: Merge "Add Assist global action for wear to different from...
Bryce Lee [Thu, 19 Mar 2015 00:32:17 +0000 (00:32 +0000)]
am 8b8a0451: am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev

* commit '8b8a045133e0466e964b4094269585708805b90a':
  Add Assist global action for wear to different from VOICE_ASSIST

9 years agoMerge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."
Shawn Willden [Thu, 19 Mar 2015 00:30:30 +0000 (00:30 +0000)]
Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."

9 years agoRename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
Shawn Willden [Thu, 19 Mar 2015 00:28:39 +0000 (18:28 -0600)]
Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.

Also change to an ENUM, to match changes in keymaster_defs.h

Change-Id: Ieda3402563b0b9e4e8b100eb69a94651e51c6347

9 years agoMerge "Clean up ripple exit, null out software animators on cancel/end"
Alan Viverette [Thu, 19 Mar 2015 00:27:45 +0000 (00:27 +0000)]
Merge "Clean up ripple exit, null out software animators on cancel/end"

9 years agoMerge changes Id9a22ad3,I629ab2c4
Shawn Willden [Thu, 19 Mar 2015 00:27:37 +0000 (00:27 +0000)]
Merge changes Id9a22ad3,I629ab2c4

* changes:
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.

9 years agoClean up ripple exit, null out software animators on cancel/end
Alan Viverette [Thu, 19 Mar 2015 00:26:54 +0000 (17:26 -0700)]
Clean up ripple exit, null out software animators on cancel/end

Bug: 19682421
Change-Id: I40ff56ed98a6c67cd01c74e455899825013a1f12

9 years agoam 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST...
Bryce Lee [Thu, 19 Mar 2015 00:21:13 +0000 (00:21 +0000)]
am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev

* commit '8bc23e82af040334af4f2af1dae9898cc8c66df8':
  Add Assist global action for wear to different from VOICE_ASSIST

9 years agoMerge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract"
Dongwon Kang [Thu, 19 Mar 2015 00:20:10 +0000 (00:20 +0000)]
Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract"

9 years agoMerge "TIF: Add TvInputInfo.isHardwareInput()."
Dongwon Kang [Thu, 19 Mar 2015 00:18:42 +0000 (00:18 +0000)]
Merge "TIF: Add TvInputInfo.isHardwareInput()."

9 years agoMerge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp...
Bryce Lee [Thu, 19 Mar 2015 00:14:06 +0000 (00:14 +0000)]
Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev