OSDN Git Service
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."
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."
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."
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."
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."
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."
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."
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."
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."
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."
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."
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."
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
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
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
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
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
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.
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.
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.
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.
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
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.
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.
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.
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.
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
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.
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.
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.
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.
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
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.
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.
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.
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.
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.
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).
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
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.
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).
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
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.
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).
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
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.
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).
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
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.
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.
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."
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
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.
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
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
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
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.
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
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.
Nick Vaccaro [Wed, 18 Mar 2015 23:44:20 +0000 (23:44 +0000)]
am
74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev
* commit '
74a0eb360da012c5a13577a8af33f6b28b0fadf7':
Avoid unhandled page fault cases on Android Wear
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.
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.
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.
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
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
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
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.
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.
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.
Joe Fernandez [Wed, 18 Mar 2015 23:29:56 +0000 (23:29 +0000)]
Merge "Doc change: add docs for SafetyNet API." into lmp-docs
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
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
Dirk Dougherty [Tue, 24 Feb 2015 00:56:04 +0000 (16:56 -0800)]
Doc change: add docs for SafetyNet API.
Change-Id: I265320788718672ac117c9ff6033e48d1e9161a5
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
Mathieu Chartier [Wed, 18 Mar 2015 23:09:21 +0000 (23:09 +0000)]
am
437ac8f8: Merge "Add JIT late override property"
* commit '
437ac8f8445b078041171eff56ce7ffbd1cf6766':
Add JIT late override property
Mathieu Chartier [Wed, 18 Mar 2015 22:56:54 +0000 (22:56 +0000)]
Merge "Add JIT late override property"
Bart Sears [Wed, 18 Mar 2015 22:53:22 +0000 (22:53 +0000)]
am
91281bbd: resolved conflicts for merge of
cc86bc0c to lmp-mr1-modular-dev
* commit '
91281bbdde1d8bcec993ff61044a5aa4897f3175':
Prevent activities from being started during setup wizard.
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.
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).
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
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.
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).
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
Andreas Gampe [Wed, 18 Mar 2015 22:33:28 +0000 (22:33 +0000)]
am
13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"
* commit '
13dbc3d48d1c4ea8854f952f9ced4b7617ae5e87':
Frameworks/base: Fix potential NPE in InputMethod
Andreas Gampe [Wed, 18 Mar 2015 22:33:16 +0000 (22:33 +0000)]
am
9cc36ac2: Merge "Frameworks/base: Remove duplicate check in Mesh"
* commit '
9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e':
Frameworks/base: Remove duplicate check in Mesh
Andreas Gampe [Wed, 18 Mar 2015 22:33:09 +0000 (22:33 +0000)]
am
2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor"
* commit '
2a247b361089c0744202b604e22f9a79d239b92c':
Frameworks/base: Fix visibility flag in Editor
Andreas Gampe [Wed, 18 Mar 2015 22:33:01 +0000 (22:33 +0000)]
am
8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script"
* commit '
8df1bedcba5bf146c49ba6b6a89e4f97c018045c':
Frameworks/base: Fix potential NPE in Script
Andrew Solovay [Wed, 18 Mar 2015 22:27:07 +0000 (22:27 +0000)]
Merge "docs: Removed sentence fragments." 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
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
Andreas Gampe [Wed, 18 Mar 2015 22:19:58 +0000 (22:19 +0000)]
Merge "Frameworks/base: Fix potential NPE in InputMethod"
Andreas Gampe [Wed, 18 Mar 2015 22:19:26 +0000 (22:19 +0000)]
Merge "Frameworks/base: Remove duplicate check in Mesh"
Andreas Gampe [Wed, 18 Mar 2015 22:19:07 +0000 (22:19 +0000)]
Merge "Frameworks/base: Fix visibility flag in Editor"
Mathieu Chartier [Tue, 17 Mar 2015 16:51:36 +0000 (09:51 -0700)]
Add JIT late override property
Required for JIT debug property since user builds can't restart
the shell.
Bug:
19735273
Change-Id: I1983852e80010c344b45e0bb459de47c56adfce8
Andreas Gampe [Wed, 18 Mar 2015 22:18:25 +0000 (22:18 +0000)]
Merge "Frameworks/base: Fix potential NPE in Script"
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
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.
Mark Salyzyn [Wed, 18 Mar 2015 20:25:54 +0000 (20:25 +0000)]
am
e2c8e504: Merge "logd: optimize statistics"
* commit '
e2c8e504d143c42c25d7e61a18f50cccb80f0c4d':
logd: optimize statistics
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
Mark Salyzyn [Wed, 18 Mar 2015 20:13:34 +0000 (20:13 +0000)]
Merge "logd: optimize statistics"
OSDN Git Service
