Commit Graph

13374 Commits

Author SHA1 Message Date
Nick Kralevich
d7138ba4bf am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit '6ab0f7a9196c3d1fc7676970febb364395c9f050':
2015-08-08 16:55:54 +00:00
Konstantinos Menychtas
2235ef28ad am 19cf6f34: am a6f725d6: am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '19cf6f34802a3cc8de3d69d6111371cf5e6c0895':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 16:50:36 +00:00
Nick Kralevich
8314da1c62 am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit '3728b128dded4501c70e509a1de0a0072ede6c1a':
  Bump revision number for all system images
2015-08-08 16:50:35 +00:00
Nick Kralevich
6ab0f7a919 am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit 'e8566ffbd9c3aa5d3c298fb00d849e2667a26519':
2015-08-08 16:45:49 +00:00
Nick Kralevich
e8566ffbd9 am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit 'c0b3754ccc8f21eea2f605b3fa05d6610e7041ec':
2015-08-08 16:41:06 +00:00
Konstantinos Menychtas
19cf6f3480 am a6f725d6: am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit 'a6f725d6fe091ae022109f86d1b5b0de104f85f3':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 16:40:53 +00:00
Nick Kralevich
3728b128dd am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit '97af61da9ccf2a1482921a814faa2e374c3a6535':
  Bump revision number for all system images
2015-08-08 16:40:51 +00:00
Nick Kralevich
c0b3754ccc am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit '9897084378439aeb02e24e5c419bba776952c36b':
2015-08-08 16:34:12 +00:00
Konstantinos Menychtas
a6f725d6fe am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '26d66e559735c91668db4baff3f4ebaf929da4b7':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 16:32:02 +00:00
Nick Kralevich
97af61da9c am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit '178f5eee37a153a676f605c789b3649b1f31294f':
  Bump revision number for all system images
2015-08-08 16:32:01 +00:00
Nick Kralevich
9897084378 am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit '4dec9d0da96c4bb8e8c138109ec8f60197f5095e':
2015-08-08 16:28:49 +00:00
Konstantinos Menychtas
26d66e5597 am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit 'c5825853c55d219032257b85a56cb105c257bdf0':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 16:27:02 +00:00
Nick Kralevich
178f5eee37 am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit 'e1baec5d7cb208a18b30279554dcc3233b79a78b':
  Bump revision number for all system images
2015-08-08 16:27:01 +00:00
Nick Kralevich
4dec9d0da9 am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit 'd2bd9bafd91577990249a906611fae8820fce247':
2015-08-08 16:23:49 +00:00
Konstantinos Menychtas
c5825853c5 am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit 'c6b7ecd791e61fc93a36ef56a70576ce0836b5a2':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 16:22:02 +00:00
Nick Kralevich
e1baec5d7c am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit '4393aeff0e438faa1f36241d87a128a697065663':
  Bump revision number for all system images
2015-08-08 16:22:01 +00:00
Konstantinos Menychtas
c6b7ecd791 am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '4e5b7ad592fba5a8265e43455f2821d38cb26e77':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 16:17:27 +00:00
Nick Kralevich
4393aeff0e am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit '947e4e275e13e76358d4def4f6b5dc5959a5e79a':
  Bump revision number for all system images
2015-08-08 16:17:26 +00:00
Nick Kralevich
d2bd9bafd9 am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit '8d3096352caf669c013556ca0a434ab72ff47ced':
2015-08-08 16:16:09 +00:00
Konstantinos Menychtas
4e5b7ad592 am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '27ac85b18c73785ac731ed6df2b862fd9c4ee135':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 16:12:11 +00:00
Nick Kralevich
947e4e275e am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit '29b060fa81f3f7b9133805b6242c11c68dbcbc39':
  Bump revision number for all system images
2015-08-08 16:12:10 +00:00
Nick Kralevich
8d3096352c am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit 'fdcb8bbb86fb4aca2d2e4fc923e3c9172d24dcb0':
2015-08-08 16:10:18 +00:00
Konstantinos Menychtas
27ac85b18c am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit 'ed56df6fb39a8861a4788d927c56ddb67dbcb60f':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 16:05:09 +00:00
Nick Kralevich
29b060fa81 am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit 'aed7823abe0a08e4ab4cf73ce3e28f4e39a03af7':
  Bump revision number for all system images
2015-08-08 16:05:08 +00:00
Nick Kralevich
fdcb8bbb86 am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit 'aed7823abe0a08e4ab4cf73ce3e28f4e39a03af7':
  Bump revision number for all system images
2015-08-08 16:04:27 +00:00
Konstantinos Menychtas
ed56df6fb3 am 91df3bc9: am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '91df3bc9842dfc6916ca330ce491ea2952fbbad0':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 16:01:22 +00:00
Nick Kralevich
aed7823abe resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
Change-Id: Iae7fe39e80a69f18025195d1a9074bd5c98ae904
2015-08-08 08:47:13 -07:00
Konstantinos Menychtas
91df3bc984 am a4bb0b7c: am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit 'a4bb0b7c89f39ce04a115eb54f204fd9e3b83506':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 15:19:25 +00:00
Nick Kralevich
8e4ac6bd72 resolve merge conflicts of 5e972519 to jb-mr1.1-docs
Change-Id: Ie5af5f01ead4d29cf84d2951606ddcd9f95a5b70
2015-08-08 07:38:47 -07:00
Konstantinos Menychtas
a4bb0b7c89 am d5abe7ea: am ccd11ec5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit 'd5abe7ea86d685009afa907c00a7bc60d4dbfe7d':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 23:09:00 +00:00
Konstantinos Menychtas
73e98d2720 am 0878662f: am e8641a98: am 202648b0: (-s ours) am ae1dae19: am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '0878662fcd3526597c331791dfefc033790b4551':
2015-08-07 22:39:19 +00:00
Konstantinos Menychtas
895ff7f38d am 9780219a: am 980be81e: am 2c414f76: (-s ours) am b2cff440: am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '9780219a0d3f96531f339e34900d18585130d43a':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 22:39:18 +00:00
Konstantinos Menychtas
3046142180 am 6285d756: am 043df767: am 474f468d: (-s ours) am 86317696: am c526381f: am 9cb9a14c: (-s ours) am bad193d9: am 91ac4618: am 0e94cee9: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '6285d756787e251473c61958287270dcb6c1a8ac':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
2015-08-07 22:39:17 +00:00
Konstantinos Menychtas
1bbfccc10c am 0c635c71: am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '0c635c711d7670fcf7c2aaf1ed5f082db40f0ad8':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 22:39:16 +00:00
Konstantinos Menychtas
5e9725191f resolved conflicts for merge of d247f473 to jb-mr1-dev
Change-Id: Ib123931dc40f5feab99eb081a68993e94ba321f6
2015-08-07 14:47:27 -07:00
Konstantinos Menychtas
0878662fcd am e8641a98: am 202648b0: (-s ours) am ae1dae19: am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit 'e8641a98b208e2b4ffe6a2bba65316c082fc3d15':
2015-08-07 19:22:56 +00:00
Konstantinos Menychtas
9780219a0d am 980be81e: am 2c414f76: (-s ours) am b2cff440: am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '980be81e7fa2ac91e1b6f422bb22611d2c95db8f':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 19:22:55 +00:00
Konstantinos Menychtas
e8641a98b2 am 202648b0: (-s ours) am ae1dae19: am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '202648b05e725306aef8a50841377ce4ccef0d02':
2015-08-07 19:14:08 +00:00
Konstantinos Menychtas
980be81e7f am 2c414f76: (-s ours) am b2cff440: am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '2c414f764082cbd77707c3582877771c9292398b':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 19:14:06 +00:00
Konstantinos Menychtas
202648b05e am ae1dae19: am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit 'ae1dae196373c6a56eb107a8114e1711da77de57':
2015-08-07 19:08:06 +00:00
Konstantinos Menychtas
2c414f7640 am b2cff440: am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit 'b2cff4409073ed6d11019a876263de73de19ab30':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 19:08:05 +00:00
Konstantinos Menychtas
6285d75678 am 043df767: am 474f468d: (-s ours) am 86317696: am c526381f: am 9cb9a14c: (-s ours) am bad193d9: am 91ac4618: am 0e94cee9: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '043df76763be819ba0a293a5616c827d864f8376':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
2015-08-07 19:06:39 +00:00
Konstantinos Menychtas
ae1dae1963 am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit 'ffb1640e93b20356335420ad643e1b02857fa7e4':
2015-08-07 19:03:17 +00:00
Konstantinos Menychtas
b2cff44090 am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '18c63f0a51cbcd69fa8a8ea81ff9f8b7c264b569':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 19:03:15 +00:00
Nick Kralevich
bc7cb7d92a resolved conflicts for merge of 5e69741e to klp-modular-dev
Change-Id: I6717f689995cafaa38c23bb8f2a64900bcc36004
2015-08-07 12:00:09 -07:00
Konstantinos Menychtas
0c635c711d am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '2d5d97ef42d4bcd72194f61e829dc04cec600a53':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 18:58:42 +00:00
Konstantinos Menychtas
043df76763 am 474f468d: (-s ours) am 86317696: am c526381f: am 9cb9a14c: (-s ours) am bad193d9: am 91ac4618: am 0e94cee9: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '474f468d75b28aea0334c27a6242a90ab5212517':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
2015-08-07 18:57:45 +00:00
Konstantinos Menychtas
ffb1640e93 am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '4ef13a69549dc633c0f617ec7159d0f0ada49a08':
2015-08-07 18:54:55 +00:00
Konstantinos Menychtas
18c63f0a51 am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix
* commit '87cd4d75a0c783444231a12b2d6366e1834cec71':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 18:54:54 +00:00
Konstantinos Menychtas
474f468d75 am 86317696: am c526381f: am 9cb9a14c: (-s ours) am bad193d9: am 91ac4618: am 0e94cee9: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '86317696c6f0efef21b8139575001f2cf3cfad1f':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
2015-08-07 18:50:58 +00:00