OSDN Git Service

android-x86/frameworks-base.git
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 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 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 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 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 "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 "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 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 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 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 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 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

9 years agoam ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing...
Joe Fernandez [Wed, 18 Mar 2015 23:54:30 +0000 (23:54 +0000)]
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 'ed6579811f466db1e5e4058508c71e412472e71e':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819

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

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

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

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

9 years agoam cb92819f: Merge "docs: Add distribution guidelines and update quality checklist...
Joe Fernandez [Wed, 18 Mar 2015 23:47:22 +0000 (23:47 +0000)]
am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs

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

9 years agoam 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp...
Joe Fernandez [Wed, 18 Mar 2015 23:43:31 +0000 (23:43 +0000)]
am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs

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

9 years agoam 51aa424a: am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play service...
Quddus Chong [Wed, 18 Mar 2015 23:43:27 +0000 (23:43 +0000)]
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 '51aa424aa1d69af9b91b5f834d1acb30e99df7b1':
  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 f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play servi...
Quddus Chong [Wed, 18 Mar 2015 23:43:22 +0000 (23:43 +0000)]
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 'f990241a74c9f885f249a78e98c8cd6b083ff1d7':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.

9 years agoMerge "cherrypick from lmp-docs docs: Update auto landing and design page image asset...
Joe Fernandez [Wed, 18 Mar 2015 23:41:54 +0000 (23:41 +0000)]
Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs

9 years agoMerge "docs: Add distribution guidelines and update quality checklist for Android...
Joe Fernandez [Wed, 18 Mar 2015 23:41:28 +0000 (23:41 +0000)]
Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs

9 years agoMerge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev
Nick Vaccaro [Wed, 18 Mar 2015 23:37:51 +0000 (23:37 +0000)]
Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev

9 years agoam 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs
Joe Fernandez [Wed, 18 Mar 2015 23:37:14 +0000 (23:37 +0000)]
am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs

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

9 years agoam 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to...
Quddus Chong [Wed, 18 Mar 2015 23:37:09 +0000 (23:37 +0000)]
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 '9b278f5615966f1d642f2503759f6618292058bb':
  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 abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0...
Quddus Chong [Wed, 18 Mar 2015 23:37:03 +0000 (23:37 +0000)]
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 'abde3d83f86af44e2beedc2fc10bfc23a405a5d9':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.

9 years agoMerge "Doc change: add docs for SafetyNet API." into lmp-docs
Joe Fernandez [Wed, 18 Mar 2015 23:29:56 +0000 (23:29 +0000)]
Merge "Doc change: add docs for SafetyNet API." into lmp-docs

9 years agoMerge "docs: Updated 'What's New' in Google Play services doc to reflect changes...
Quddus Chong [Wed, 18 Mar 2015 23:29:55 +0000 (23:29 +0000)]
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

9 years agoMerge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated...
Quddus Chong [Wed, 18 Mar 2015 23:29:42 +0000 (23:29 +0000)]
Merge "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 agoDoc change: add docs for SafetyNet API.
Dirk Dougherty [Tue, 24 Feb 2015 00:56:04 +0000 (16:56 -0800)]
Doc change: add docs for SafetyNet API.

Change-Id: I265320788718672ac117c9ff6033e48d1e9161a5

9 years agodocs: Updated 'What's New' in Google Play services doc to reflect changes in GMS...
Quddus Chong [Wed, 4 Mar 2015 22:46:18 +0000 (14:46 -0800)]
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.

Change-Id: I4154c04a3a64fce1ec314a40237ab4c5472d651c

9 years agoam 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs
Andrew Solovay [Wed, 18 Mar 2015 22:44:32 +0000 (22:44 +0000)]
am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs

* commit '278538193c2eb68d13c3f8a741ab6c2274feb266':
  docs: Removed sentence fragments.

9 years agoam 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into...
Andrew Solovay [Wed, 18 Mar 2015 22:44:24 +0000 (22:44 +0000)]
am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs

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

9 years agoam dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines...
Andrew Solovay [Wed, 18 Mar 2015 22:44:09 +0000 (22:44 +0000)]
am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

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

9 years agoam 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs
Andrew Solovay [Wed, 18 Mar 2015 22:35:59 +0000 (22:35 +0000)]
am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs

* commit '78bbfe049c5e7a0c2f7ac8fe39f45b11d9099a55':
  docs: Removed sentence fragments.

9 years agoam ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
Andrew Solovay [Wed, 18 Mar 2015 22:35:49 +0000 (22:35 +0000)]
am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs

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

9 years agoam 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code sampl...
Andrew Solovay [Wed, 18 Mar 2015 22:35:45 +0000 (22:35 +0000)]
am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

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

9 years agoMerge "docs: Removed sentence fragments." into lmp-docs
Andrew Solovay [Wed, 18 Mar 2015 22:27:07 +0000 (22:27 +0000)]
Merge "docs: Removed sentence fragments." into lmp-docs

9 years agoMerge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
Andrew Solovay [Wed, 18 Mar 2015 22:26:04 +0000 (22:26 +0000)]
Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs

9 years agoMerge "docs: Fixed broken image link, and broke long lines in code samples" into...
Andrew Solovay [Wed, 18 Mar 2015 22:23:10 +0000 (22:23 +0000)]
Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

9 years agoresolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev
Bart Sears [Wed, 18 Mar 2015 21:12:10 +0000 (14:12 -0700)]
resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev

Change-Id: Ifb6c4ec5560c50a4bb91426734d7e05cd0c46e93

9 years agoam c2eb5c60: Merge "Prevent activities from being started during setup wizard." into...
Bart Sears [Wed, 18 Mar 2015 20:28:59 +0000 (20:28 +0000)]
am c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev

* commit 'c2eb5c602d36d91483c8f24b0c6859e4283724b4':
  Prevent activities from being started during setup wizard.

9 years agoMerge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
Bart Sears [Wed, 18 Mar 2015 20:21:57 +0000 (20:21 +0000)]
Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev

9 years agodocs: Removed sentence fragments.
Andrew Solovay [Wed, 18 Mar 2015 18:56:20 +0000 (11:56 -0700)]
docs: Removed sentence fragments.

These fragments were left over from the edit process for the original
CL (http://ag/586972). The paragraph they belong to was removed.

See first comment for doc stage location.

bug: 19793140
Change-Id: Iafa30c4036c57ba00b534d619cd1fa4135f60175

9 years agoam 76620791: am b3a1b663: Merge "Avoid crashing on corrupted notifications." into...
Dan Sandler [Wed, 18 Mar 2015 18:35:20 +0000 (18:35 +0000)]
am 76620791: am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev

* commit '76620791600af3b3d6f6ad8ba3534320265153db':
  Avoid crashing on corrupted notifications.

9 years agoam b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
Dan Sandler [Wed, 18 Mar 2015 18:29:48 +0000 (18:29 +0000)]
am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev

* commit 'b3a1b6632e403926fed995e851a8e44fc944c663':
  Avoid crashing on corrupted notifications.

9 years agoMerge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
Dan Sandler [Wed, 18 Mar 2015 18:23:19 +0000 (18:23 +0000)]
Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev

9 years agoam 96693b29: am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads...
Rich Slogar [Wed, 18 Mar 2015 17:41:28 +0000 (17:41 +0000)]
am 96693b29: am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2

* commit '96693b29774713d156fd035cda174cfd7b4d9b65':
  docs: downloads for sdk 24.1.2

9 years agoam 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:35:46 +0000 (17:35 +0000)]
am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2

* commit '8d3f587f15016d193e4739e3893b77e11336b498':
  docs: downloads for sdk 24.1.2

9 years agoam 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:27:29 +0000 (17:27 +0000)]
am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2

* commit '57c24fbb90dd7b342b06e2daecc1033f92d730da':
  docs: downloads for sdk 24.1.2

9 years agoam 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:20:51 +0000 (17:20 +0000)]
am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2

* commit '2fc33a008c02cf408e1d270972bbf681c7a36785':
  docs: downloads for sdk 24.1.2

9 years agoam ddc44153: docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:13:55 +0000 (17:13 +0000)]
am ddc44153: docs: downloads for sdk 24.1.2

* commit 'ddc44153295174e8195286c21d7edcd3962b3661':
  docs: downloads for sdk 24.1.2

9 years agoam 54064f66: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 16:54:56 +0000 (16:54 +0000)]
am 54064f66: (-s ours) Import translations. DO NOT MERGE

* commit '54064f66c949fa4069b4abb025c31afe28ac98ab':
  Import translations. DO NOT MERGE

9 years agoam 94573dc5: am 89f41eb3: Define the capability to speed up MT call audio
Dong Zhou [Wed, 18 Mar 2015 16:54:37 +0000 (16:54 +0000)]
am 94573dc5: am 89f41eb3: Define the capability to speed up MT call audio

* commit '94573dc5515d69458effc92b66922f757adde4d0':
  Define the capability to speed up MT call audio

9 years agoam 4ff668d4: Track change to Conscrypt
Kenny Root [Wed, 18 Mar 2015 16:54:33 +0000 (16:54 +0000)]
am 4ff668d4: Track change to Conscrypt

* commit '4ff668d47ab9f49ec81606aec6d469ecd6ca37fa':
  Track change to Conscrypt

9 years agoam fbd8805c: Merge "Track change to Conscrypt" into lmp-mr1-ub-dev
Kenny Root [Wed, 18 Mar 2015 16:54:29 +0000 (16:54 +0000)]
am fbd8805c: Merge "Track change to Conscrypt" into lmp-mr1-ub-dev

* commit 'fbd8805cd783e34aebf521913aeab6cfd483b7b2':
  Track change to Conscrypt

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 18 Mar 2015 15:37:10 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 15:00:13 +0000 (08:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: I20b86613eb30cf53d0a421068cb3a93e63750c9f
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 13:04:44 +0000 (06:04 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ifd3f512fcd1aabd685f10218eceda8f4f83bb116
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:47:44 +0000 (05:47 -0700)]
Import translations. DO NOT MERGE

Change-Id: I046ce211561d45c3ee6b1763a7578d9ac54f3c90
Auto-generated-cl: translation import

9 years agodocs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 00:19:07 +0000 (17:19 -0700)]
docs: downloads for sdk 24.1.2

b.android 160727

Change-Id: I112badc736ce4b85fabe0b702a2b24800ee589bd

9 years agoam 89f41eb3: Define the capability to speed up MT call audio
Dong Zhou [Tue, 17 Mar 2015 22:28:22 +0000 (22:28 +0000)]
am 89f41eb3: Define the capability to speed up MT call audio

* commit '89f41eb39e910e220957ac861651ead17eff9085':
  Define the capability to speed up MT call audio

9 years agoTrack change to Conscrypt
Kenny Root [Wed, 26 Nov 2014 17:08:40 +0000 (09:08 -0800)]
Track change to Conscrypt

(cherry picked from commit 9d2d6b6b4b1b16221cbd857703cd6301c6bf873c)

Bug: 19798387
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413

9 years agoMerge "Track change to Conscrypt" into lmp-mr1-ub-dev
Kenny Root [Tue, 17 Mar 2015 22:21:52 +0000 (22:21 +0000)]
Merge "Track change to Conscrypt" into lmp-mr1-ub-dev

9 years agoDefine the capability to speed up MT call audio
Dong Zhou [Sun, 15 Mar 2015 16:59:49 +0000 (11:59 -0500)]
Define the capability to speed up MT call audio

Bug: 19656525
Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d

9 years agoTrack change to Conscrypt
Kenny Root [Fri, 31 Oct 2014 17:28:04 +0000 (10:28 -0700)]
Track change to Conscrypt

Change way in which an outside caller can get the preferred SSLContext.

(cherry picked from commit 8a970637208207955fb6a719bd82902384b3c743)

Bug: 19798387
Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09

9 years agoMerge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev
Filip Gruszczynski [Tue, 17 Mar 2015 20:38:30 +0000 (20:38 +0000)]
Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev

9 years agoam 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Brian Carlstrom [Tue, 17 Mar 2015 19:36:19 +0000 (19:36 +0000)]
am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev

* commit '83419118e3c72311ef6b900457d1b03fd5c77883':
  Update vmSafeMode documentation

9 years agoam 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Brian Carlstrom [Tue, 17 Mar 2015 19:29:20 +0000 (19:29 +0000)]
am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev

* commit '97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
  Update vmSafeMode documentation

9 years agoMerge "Update vmSafeMode documentation" into lmp-mr1-dev
Brian Carlstrom [Tue, 17 Mar 2015 19:22:45 +0000 (19:22 +0000)]
Merge "Update vmSafeMode documentation" into lmp-mr1-dev

9 years agoAdd animation to zeroing burn in protection.
Filip Gruszczynski [Mon, 16 Mar 2015 21:47:32 +0000 (14:47 -0700)]
Add animation to zeroing burn in protection.

Also don't shift immediately after starting ambient mode, but wait until
the first update.

Bug: 19521822
Change-Id: Id0b267d0f30e4533195dcfadbed726db0866e4db

9 years agoMerge "Option for going home when going to sleep for devices without physical button...
Filip Gruszczynski [Tue, 17 Mar 2015 18:29:29 +0000 (18:29 +0000)]
Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev

9 years agoAvoid crashing on corrupted notifications.
Dan Sandler [Wed, 25 Feb 2015 18:20:39 +0000 (13:20 -0500)]
Avoid crashing on corrupted notifications.

If a notification content view has an @id/icon or
@id/right_icon, we need to make sure those ImageViews
actually have a drawable inside.

Bug: 19487078
Change-Id: I4ef6c4a10926823aa8680628097ed150d9e717d4

9 years agoam 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:36:05 +0000 (14:36 +0000)]
am 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.

* commit '842eee9f816a2e35bf3c9ce6c14cd5e43684265b':
  Fix AppCompat action bar theming.