Andrew Solovay
|
164dd96eec
|
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
|
2015-03-19 01:49:00 +00:00 |
|
Andrew Solovay
|
118915706e
|
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
|
2015-03-19 01:42:48 +00:00 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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
|
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 |
|
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 |
|
Rich Slogar
|
42e0a6316f
|
am 1265575d: am 96693b29: am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2
* commit '1265575d8a31f415606cccc39b24466ecae5731d':
docs: downloads for sdk 24.1.2
|
2015-03-18 18:25:10 +00:00 |
|
Geoff Mendal
|
28c320c296
|
am b48d3ce0: (-s ours) am 54064f66: (-s ours) Import translations. DO NOT MERGE
* commit 'b48d3ce076233a2da0b2146882c2e22a332fc665':
Import translations. DO NOT MERGE
|
2015-03-18 18:23:51 +00:00 |
|
Dong Zhou
|
00de38a188
|
am 58ba39ed: am 94573dc5: am 89f41eb3: Define the capability to speed up MT call audio
* commit '58ba39ed86798c3d0877e0ed6bdf09c74007c36f':
Define the capability to speed up MT call audio
|
2015-03-18 18:23:45 +00:00 |
|
Dan Sandler
|
b3a1b6632e
|
Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
|
2015-03-18 18:23:20 +00:00 |
|
Kenny Root
|
a52b0988f2
|
resolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aosp
|
2015-03-18 11:20:30 -07:00 |
|
Rich Slogar
|
1265575d8a
|
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
|
2015-03-18 17:41:28 +00:00 |
|
Rich Slogar
|
96693b2977
|
am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2
* commit '8d3f587f15016d193e4739e3893b77e11336b498':
docs: downloads for sdk 24.1.2
|
2015-03-18 17:35:46 +00:00 |
|
Rich Slogar
|
8d3f587f15
|
am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2
* commit '57c24fbb90dd7b342b06e2daecc1033f92d730da':
docs: downloads for sdk 24.1.2
|
2015-03-18 17:27:29 +00:00 |
|
Kenny Root
|
61ecb53e73
|
resolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aosp
Change-Id: Ifff03303c62aeba576974b877988b3a479945aa2
|
2015-03-18 10:26:11 -07:00 |
|
Rich Slogar
|
57c24fbb90
|
am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2
* commit '2fc33a008c02cf408e1d270972bbf681c7a36785':
docs: downloads for sdk 24.1.2
|
2015-03-18 17:20:51 +00:00 |
|
Rich Slogar
|
2fc33a008c
|
am ddc44153: docs: downloads for sdk 24.1.2
* commit 'ddc44153295174e8195286c21d7edcd3962b3661':
docs: downloads for sdk 24.1.2
|
2015-03-18 17:13:55 +00:00 |
|