Andrew Solovay
006d751215
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
2015-03-19 01:25:57 +00:00
Andrew Solovay
b08f20787c
am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs
...
* commit '3f7f78c6518f93b694bd868d406c755e2469584c':
docs: Removed sentence fragments.
2015-03-19 00:55:12 +00:00
Andrew Solovay
cf34a6d1a1
am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
...
* commit '46bda6a4838e592fd3cc0d9334ae92cdc7434f3e':
docs: Fixed typo (spurious quotation mark).
2015-03-19 00:55:08 +00:00
Andrew Solovay
a014174852
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
2015-03-19 00:55:01 +00:00
Shawn Willden
1bed39a5e4
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.
2015-03-19 00:42:09 +00:00
Shawn Willden
615f39f911
am 254c58c4: Merge changes Id9a22ad3,I629ab2c4
...
* commit '254c58c4e760e0af132d680fbd783a38ef436435':
Add KM_TAG_AUTH_TOKEN.
Add support for KM_TAG_USER_SECURE_ID.
2015-03-19 00:41:58 +00:00
Shawn Willden
e921b8a28f
Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."
2015-03-19 00:30:30 +00:00
Shawn Willden
e90774ddbc
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
2015-03-18 18:28:39 -06:00
Shawn Willden
254c58c4e7
Merge changes Id9a22ad3,I629ab2c4
...
* changes:
Add KM_TAG_AUTH_TOKEN.
Add support for KM_TAG_USER_SECURE_ID.
2015-03-19 00:27:38 +00:00
Bryce Lee
8b8a045133
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
2015-03-19 00:21:13 +00:00
Bryce Lee
8bc23e82af
Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev
2015-03-19 00:14:07 +00:00
Jason Sams
e16da12b7b
Make it harder to leak contexts
...
Change-Id: Ied60b6428bedb200d7b5b627e8196fbf2b4151e1
2015-03-18 17:04:18 -07:00
Joe Fernandez
cdf130800b
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
2015-03-18 23:54:30 +00:00
Joe Fernandez
e31c904831
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.
2015-03-18 23:54:22 +00:00
Eric Gilmore
f1598d1852
Changes for a quick, pre-migration bug sprint:
...
Bug: 19679070, 19716684, 19680472.
Change-Id: I14ba1cf53ea42cd7739793fd9873e40e4a2ee6a0
2015-03-18 16:53:47 -07:00
Joe Fernandez
ed6579811f
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
2015-03-18 23:47:26 +00:00
Joe Fernandez
462dc7b9ca
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.
2015-03-18 23:47:22 +00:00
Nick Vaccaro
23c7cef2ca
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
2015-03-18 23:44:20 +00:00
Joe Fernandez
d2484a8a53
am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs
...
* commit '26e332bf6e99845541d2056fe6a1a418f9409bdb':
Doc change: add docs for SafetyNet API.
2015-03-18 23:43:31 +00:00
Quddus Chong
c63471ade6
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.
2015-03-18 23:43:27 +00:00
Quddus Chong
5192ac8d06
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 .
2015-03-18 23:43:22 +00:00
Joe Fernandez
59d6c8bdaf
Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs
2015-03-18 23:41:56 +00:00
Joe Fernandez
cb92819fac
Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs
2015-03-18 23:41:29 +00:00
Nick Vaccaro
74a0eb360d
Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev
2015-03-18 23:37:52 +00:00
Joe Fernandez
26e332bf6e
am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs
...
* commit '3bbb646b8a231731327d10a3a243e2f252e185f1':
Doc change: add docs for SafetyNet API.
2015-03-18 23:37:14 +00:00
Quddus Chong
51aa424aa1
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.
2015-03-18 23:37:09 +00:00
Quddus Chong
f990241a74
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 .
2015-03-18 23:37:03 +00:00
Joe Fernandez
3bbb646b8a
Merge "Doc change: add docs for SafetyNet API." into lmp-docs
2015-03-18 23:30:09 +00:00
Quddus Chong
9b278f5615
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
2015-03-18 23:29:57 +00:00
Quddus Chong
abde3d83f8
Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs
2015-03-18 23:29:44 +00:00
Dirk Dougherty
11e8057566
Doc change: add docs for SafetyNet API.
...
Change-Id: I265320788718672ac117c9ff6033e48d1e9161a5
2015-03-18 16:16:18 -07:00
Quddus Chong
b2a6185e25
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
2015-03-18 16:11:23 -07:00
Mathieu Chartier
f792e01606
am 437ac8f8: Merge "Add JIT late override property"
...
* commit '437ac8f8445b078041171eff56ce7ffbd1cf6766':
Add JIT late override property
2015-03-18 23:09:21 +00:00
Mathieu Chartier
437ac8f844
Merge "Add JIT late override property"
2015-03-18 22:56:55 +00:00
Bart Sears
f5353e9dda
am 91281bbd: resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev
...
* commit '91281bbdde1d8bcec993ff61044a5aa4897f3175':
Prevent activities from being started during setup wizard.
2015-03-18 22:53:22 +00:00
Andrew Solovay
3f7f78c651
am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs
...
* commit '278538193c2eb68d13c3f8a741ab6c2274feb266':
docs: Removed sentence fragments.
2015-03-18 22:44:32 +00:00
Andrew Solovay
46bda6a483
am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
...
* commit '6fd36f11bee008dae92ed312e4a8291417e6e93f':
docs: Fixed typo (spurious quotation mark).
2015-03-18 22:44:24 +00:00
Andrew Solovay
42f966c9df
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
2015-03-18 22:44:09 +00:00
Andrew Solovay
278538193c
am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs
...
* commit '78bbfe049c5e7a0c2f7ac8fe39f45b11d9099a55':
docs: Removed sentence fragments.
2015-03-18 22:35:59 +00:00
Andrew Solovay
6fd36f11be
am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
...
* commit 'ae279bd5b03f472d4bd1427365009269db9fe5e3':
docs: Fixed typo (spurious quotation mark).
2015-03-18 22:35:49 +00:00
Andrew Solovay
dbec5ae69a
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
2015-03-18 22:35:45 +00:00
Andreas Gampe
b078ff16a3
am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"
...
* commit '13dbc3d48d1c4ea8854f952f9ced4b7617ae5e87':
Frameworks/base: Fix potential NPE in InputMethod
2015-03-18 22:33:28 +00:00
Andreas Gampe
4f0a96d2d9
am 9cc36ac2: Merge "Frameworks/base: Remove duplicate check in Mesh"
...
* commit '9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e':
Frameworks/base: Remove duplicate check in Mesh
2015-03-18 22:33:16 +00:00
Andreas Gampe
1eca7d66ee
am 2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor"
...
* commit '2a247b361089c0744202b604e22f9a79d239b92c':
Frameworks/base: Fix visibility flag in Editor
2015-03-18 22:33:09 +00:00
Andreas Gampe
1dae2f9341
am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script"
...
* commit '8df1bedcba5bf146c49ba6b6a89e4f97c018045c':
Frameworks/base: Fix potential NPE in Script
2015-03-18 22:33:01 +00:00
Andrew Solovay
78bbfe049c
Merge "docs: Removed sentence fragments." into lmp-docs
2015-03-18 22:27:08 +00:00
Andrew Solovay
ae279bd5b0
Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
2015-03-18 22:26:05 +00:00
Andrew Solovay
0aef0abf3d
Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs
2015-03-18 22:23:13 +00:00
Andreas Gampe
13dbc3d48d
Merge "Frameworks/base: Fix potential NPE in InputMethod"
2015-03-18 22:19:58 +00:00
Andreas Gampe
9cc36ac2a2
Merge "Frameworks/base: Remove duplicate check in Mesh"
2015-03-18 22:19:27 +00:00
