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
Andreas Gampe
2a247b3610
Merge "Frameworks/base: Fix visibility flag in Editor"
2015-03-18 22:19:08 +00:00
Mathieu Chartier
7a49028aa2
Add JIT late override property
...
Required for JIT debug property since user builds can't restart
the shell.
Bug: 19735273
Change-Id: I1983852e80010c344b45e0bb459de47c56adfce8
2015-03-18 15:18:52 -07:00
Andreas Gampe
8df1bedcba
Merge "Frameworks/base: Fix potential NPE in Script"
2015-03-18 22:18:26 +00:00
Bart Sears
91281bbdde
resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev
...
Change-Id: Ifb6c4ec5560c50a4bb91426734d7e05cd0c46e93
2015-03-18 14:12:10 -07:00
Bart Sears
cc86bc0c92
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.
2015-03-18 20:28:59 +00:00
Mark Salyzyn
6a9cd7b0d4
am e2c8e504: Merge "logd: optimize statistics"
...
* commit 'e2c8e504d143c42c25d7e61a18f50cccb80f0c4d':
logd: optimize statistics
2015-03-18 20:25:54 +00:00
Bart Sears
c2eb5c602d
Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
2015-03-18 20:22:36 +00:00
Mark Salyzyn
e2c8e504d1
Merge "logd: optimize statistics"
2015-03-18 20:13:35 +00:00
Jason Sams
b533f3e1ad
am 1aadd347: Merge "Avoid duplicate surface creation."
...
* commit '1aadd3474177e6946ea0aae03f0628e436d0cf87':
Avoid duplicate surface creation.
2015-03-18 19:57:44 +00:00
Jason Sams
1aadd34741
Merge "Avoid duplicate surface creation."
2015-03-18 19:44:37 +00:00
Andreas Gampe
ad555f91a0
Frameworks/base: Fix potential NPE in Script
...
Bug: 19797138
Change-Id: I5cd9394bd2c0f7c044c1f2f24665384fa797cd97
2015-03-18 12:24:57 -07:00
Andrew Solovay
43100d3203
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
2015-03-18 11:56:20 -07:00
Dan Sandler
b509a809b2
am fbd99e9f: am 76620791: am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
...
* commit 'fbd99e9fecea1cf467c082d2096cb1c3868685d4':
Avoid crashing on corrupted notifications.
2015-03-18 18:42:47 +00:00
Dan Sandler
fbd99e9fec
am 76620791: am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
...
* commit '76620791600af3b3d6f6ad8ba3534320265153db':
Avoid crashing on corrupted notifications.
2015-03-18 18:35:20 +00:00
Dan Sandler
7662079160
am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
...
* commit 'b3a1b6632e403926fed995e851a8e44fc944c663':
Avoid crashing on corrupted notifications.
2015-03-18 18:29:48 +00:00