John Reck
|
49bc4acfad
|
resolved conflicts for merge of fe5ac4fc to master
Change-Id: I6c0cc82db14b56297586469f940e408c0e218b3b
|
2015-01-29 12:53:38 -08:00 |
|
John Reck
|
fe5ac4fc31
|
am 5f3e21ce: am 6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev
* commit '5f3e21cebeecf042e8e18a5021b3965415d9ff60':
Allow ~Layer() to happen after onGLContextDestroyed
|
2015-01-29 20:28:08 +00:00 |
|
John Reck
|
5f3e21cebe
|
am 6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev
* commit '6efc3ac6d2094c72b6a2e288101a5349b017274d':
Allow ~Layer() to happen after onGLContextDestroyed
|
2015-01-29 20:18:58 +00:00 |
|
John Reck
|
6efc3ac6d2
|
Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev
|
2015-01-29 20:13:05 +00:00 |
|
Jon Larimer
|
293b7b4fe5
|
am 3ac22f7a: am 49127bdd: am 0312d2ff: am 320f505e: am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58
* commit '3ac22f7a386317ed4affe5bca0406501726ddb73':
|
2015-01-29 20:03:25 +00:00 |
|
Jon Larimer
|
44f389c4f9
|
am ca04fca5: (-s ours) am eb56f7a5: am 4c2a6fdd: am 64bdf77d: am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge:
* commit 'ca04fca501aa1b3ca979bd860bb722ba3e3e0662':
|
2015-01-29 20:03:21 +00:00 |
|
Jon Larimer
|
3ac22f7a38
|
am 49127bdd: am 0312d2ff: am 320f505e: am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58
* commit '49127bddaf29c725f0cbdfe53f33e37afdd3da9f':
|
2015-01-29 19:56:45 +00:00 |
|
Jon Larimer
|
ca04fca501
|
am eb56f7a5: am 4c2a6fdd: am 64bdf77d: am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 6fe42f0 -s o
* commit 'eb56f7a5dc66cb0ca54afd25a9d089e7931512df':
|
2015-01-29 19:56:40 +00:00 |
|
Jon Larimer
|
49127bddaf
|
am 0312d2ff: am 320f505e: am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58
* commit '0312d2ff45d895260f0995fc784bea706bd4f13d':
|
2015-01-29 19:51:08 +00:00 |
|
Jon Larimer
|
eb56f7a5dc
|
am 4c2a6fdd: am 64bdf77d: am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 6fe42f0 -s ours
* commit '4c2a6fddb10a8b4c00391d54371aaa14f5d901ce':
|
2015-01-29 19:51:05 +00:00 |
|
Jon Larimer
|
0312d2ff45
|
am 320f505e: am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58
* commit '320f505ed52f8970b08eb93766af831de0332415':
|
2015-01-29 19:46:00 +00:00 |
|
Jon Larimer
|
4c2a6fddb1
|
am 64bdf77d: am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 6fe42f0 -s ours
* commit '64bdf77d9515f587f31998b614e524c26b2415a4':
|
2015-01-29 19:45:56 +00:00 |
|
Jon Larimer
|
320f505ed5
|
am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58
* commit '52fba8d13428665fde405ef91857c00f0d399610':
|
2015-01-29 19:38:51 +00:00 |
|
Jon Larimer
|
64bdf77d95
|
am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 6fe42f0 -s ours
* commit '8bb65246f2655fae8d807db973c5eaeff78733cc':
|
2015-01-29 19:38:48 +00:00 |
|
Jon Larimer
|
52fba8d134
|
am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7
automerge: bebfd58
* commit 'bebfd58604ae8a70c08056f3a5cd9289b27fe11c':
|
2015-01-29 19:30:57 +00:00 |
|
Jon Larimer
|
8bb65246f2
|
am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours
automerge: 6fe42f0 -s ours
* commit '6fe42f08702a0773c0dd2aad2d41c54f73bb057b':
|
2015-01-29 19:29:31 +00:00 |
|
Jon Larimer
|
f53d1bf5b4
|
am ac436d55: am feabeb62: am 8b8d6195: am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
automerge: 04ac1ad
* commit '04ac1ad29b7148eb1c35a2c73ff1f9c68ed9fd84':
Fix ParceledListSlice to enforce the same concrete types among its elements.
|
2015-01-29 19:13:06 +00:00 |
|
Jon Larimer
|
f3000d2cc1
|
am ee7e1479: am 51ea897f: am 470f3a98: am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
automerge: fd9ba59 -s ours
* commit 'fd9ba59c62c0f1d94cf2c015620b7beb55583eb9':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 19:11:37 +00:00 |
|
Jon Larimer
|
04ac1ad29b
|
am ac436d55: am feabeb62: am 8b8d6195: am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit 'ac436d55fc128797f57f674541c6e77dd44b7416':
Fix ParceledListSlice to enforce the same concrete types among its elements.
|
2015-01-29 19:09:05 +00:00 |
|
Jon Larimer
|
fd9ba59c62
|
am ee7e1479: am 51ea897f: am 470f3a98: am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit 'ee7e1479f59aeb41aa54ae7e88dd5adb4f454615':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 19:09:00 +00:00 |
|
Jon Larimer
|
ac436d55fc
|
am feabeb62: am 8b8d6195: am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit 'feabeb624361c234279a03c6dcdb6a53ee48eddc':
Fix ParceledListSlice to enforce the same concrete types among its elements.
|
2015-01-29 19:04:40 +00:00 |
|
Jon Larimer
|
ee7e1479f5
|
am 51ea897f: am 470f3a98: am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '51ea897fca66c4042563a89f4593b9fd41f01b9d':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 19:04:37 +00:00 |
|
Jon Larimer
|
feabeb6243
|
am 8b8d6195: am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '8b8d61952a4599439f3308a5f73bb0a2a0610563':
Fix ParceledListSlice to enforce the same concrete types among its elements.
|
2015-01-29 18:57:20 +00:00 |
|
Jon Larimer
|
51ea897fca
|
am 470f3a98: am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '470f3a98be8ecff3beca275c20b085da928e8943':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 18:57:17 +00:00 |
|
Jon Larimer
|
6814e1a3e1
|
am 1b570538: (-s ours) am 95b85c15: am 9a2793e0: am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours automerge: f8571c8a -s ours automerge: 3308ad4 -s ours
* commit '1b5705386aed3135526ffe7c3f7b460ad944bcb3':
|
2015-01-29 18:56:29 +00:00 |
|
Jon Larimer
|
bebfd58604
|
am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
automerge: ea63fd7
* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
Fix ParceledListSlice to enforce the same concrete types among its elements.
|
2015-01-29 18:55:25 +00:00 |
|
Jon Larimer
|
6fe42f0870
|
am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
automerge: 48dad94 -s ours
* commit '48dad94919c9f5027559feed3b05d8d01a03f687':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 18:54:16 +00:00 |
|
Jon Larimer
|
8b8d61952a
|
am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '9570e144fe38a53c507838cc5234225c7a0da315':
Fix ParceledListSlice to enforce the same concrete types among its elements.
|
2015-01-29 18:50:24 +00:00 |
|
Jon Larimer
|
470f3a98be
|
am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '0a63d8176d8c3099c2e40bdbb00220f5aeeff69e':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 18:50:21 +00:00 |
|
Jon Larimer
|
1b5705386a
|
am 95b85c15: am 9a2793e0: am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours automerge: f8571c8a -s ours
automerge: 3308ad4 -s ours
* commit '3308ad42fa162fbdda26337f64e00603b1388ec7':
|
2015-01-29 18:50:11 +00:00 |
|
Jon Larimer
|
8866ada112
|
am 143ac135: (-s ours) am 7a7d3a0e: am f9c96522: am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '143ac135dcf85b899ae387be2f13401ecd43f08b':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 18:48:55 +00:00 |
|
Jon Larimer
|
3308ad42fa
|
am 95b85c15: am 9a2793e0: am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours automerge: f8571c8a -s ours
* commit '95b85c1539c1569371ba0576da635e3e2557a433':
|
2015-01-29 18:47:54 +00:00 |
|
Jon Larimer
|
9570e144fe
|
am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
Fix ParceledListSlice to enforce the same concrete types among its elements.
|
2015-01-29 18:43:47 +00:00 |
|
Jon Larimer
|
0a63d8176d
|
am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '48dad94919c9f5027559feed3b05d8d01a03f687':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 18:43:43 +00:00 |
|
Jon Larimer
|
143ac135dc
|
am 7a7d3a0e: am f9c96522: am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '7a7d3a0ee018e9309151b141ce472a47514877a2':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 18:40:15 +00:00 |
|
Jon Larimer
|
95b85c1539
|
am 9a2793e0: am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours automerge: f8571c8a -s ours
* commit '9a2793e0ba11336b57457cde0d6dbc3628e853ed':
|
2015-01-29 18:40:14 +00:00 |
|
Alan Viverette
|
a29b65a37b
|
Merge "Clear accessibility focus when the window loses visibility"
|
2015-01-29 18:37:38 +00:00 |
|
Jon Larimer
|
ea63fd7f9b
|
am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '88add68942694fc643518bcf5c26f6c3df7e9aa0':
Fix ParceledListSlice to enforce the same concrete types among its elements.
|
2015-01-29 18:36:59 +00:00 |
|
Jon Larimer
|
48dad94919
|
am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit 'a43742ec620cb11faffa2c2b1847dc1accce5736':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 18:36:55 +00:00 |
|
Jon Larimer
|
9a2793e0ba
|
am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours automerge: f8571c8a -s ours
* commit '074c11161aecb1e0e1fc2e5db5588ca5519e4b46':
|
2015-01-29 18:33:34 +00:00 |
|
Jon Larimer
|
88add68942
|
am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit 'a5ccca242747d59233ec5ecebc20d4a721e7850e':
Fix ParceledListSlice to enforce the same concrete types among its elements.
|
2015-01-29 18:32:09 +00:00 |
|
Jon Larimer
|
a43742ec62
|
am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '6813f29e3247f0567b77fe7eb451215b5fadf67b':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 18:32:05 +00:00 |
|
Jon Larimer
|
7a7d3a0ee0
|
am f9c96522: am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit 'f9c9652256921eeb70484757f375aaa252f9c574':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 18:31:44 +00:00 |
|
Jon Larimer
|
074c11161a
|
am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours
automerge: f8571c8a -s ours
* commit 'f8571c8a170f0cb8341b3e2adda306bb709b824a':
|
2015-01-29 18:25:48 +00:00 |
|
Jon Larimer
|
a5ccca2427
|
am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '2982d64802ed0d5b59130680c43485e9d7862e50':
Fix ParceledListSlice to enforce the same concrete types among its elements.
|
2015-01-29 18:25:28 +00:00 |
|
Jon Larimer
|
6813f29e32
|
am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '76cdbb0475fe881c8e7320c277e5ea4848be5bff':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 18:25:24 +00:00 |
|
Jon Larimer
|
f9c9652256
|
am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '6959a94f372d54e63f53b8cfc98b57ce4ab0866b':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 18:24:20 +00:00 |
|
John Reck
|
57998017ff
|
Allow ~Layer() to happen after onGLContextDestroyed
Bug: 19146354
Change-Id: I9e885936168bd541bfbed4064ad67ab524f58e32
|
2015-01-29 10:17:57 -08:00 |
|
Jon Larimer
|
6959a94f37
|
am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '336fc1fff793b2e5272f0b37cefe9ccf5dba5a53':
DO NOT MERGE Restore calling identity before checking permission
|
2015-01-29 18:14:44 +00:00 |
|
Jon Larimer
|
2982d64802
|
am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit 'de9a76ed997c300a6c5f2f82c517719503af9045':
Fix ParceledListSlice to enforce the same concrete types among its elements.
|
2015-01-29 18:12:01 +00:00 |
|