Commit Graph

15776 Commits

Author SHA1 Message Date
Nick Kralevich
f2a8aa34eb am fdcade18: am ff246059: am 5fc6ca11: am d7138ba4: 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 'fdcade18504881c84e264d0c5831df0ae00aa2ec':
2015-08-08 17:23:06 +00:00
Konstantinos Menychtas
33c7b97781 am 44a06cae: am fe281e20: am d886ba21: am 2235ef28: (-s ours) 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 syst
* commit '44a06cae629e2ab3b6519f21e5dce82006d76e83':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 17:23:05 +00:00
Nick Kralevich
5e5f2ab38a am 1ea2e463: am 6d181dc0: am 63c3068a: am 8314da1c: 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 '1ea2e463a3edef81ff2a4d166eadd826dc0b3bdd':
  Bump revision number for all system images
2015-08-08 17:23:03 +00:00
Nick Kralevich
fdcade1850 am ff246059: am 5fc6ca11: am d7138ba4: 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 'ff246059fcf6d2071558ba490d30256e1e56e153':
2015-08-08 17:14:54 +00:00
Konstantinos Menychtas
44a06cae62 am fe281e20: am d886ba21: am 2235ef28: (-s ours) 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 revi
* commit 'fe281e20be84db5cdca9c26713d57bca42c27f88':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 17:14:53 +00:00
Nick Kralevich
1ea2e463a3 am 6d181dc0: am 63c3068a: am 8314da1c: 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 '6d181dc06a7746f47e6ff15e5e65212e0491d7d7':
  Bump revision number for all system images
2015-08-08 17:14:51 +00:00
Nick Kralevich
ff246059fc am 5fc6ca11: am d7138ba4: 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 '5fc6ca1190052933938b6cf70d1f3f696e0db7a5':
2015-08-08 17:06:57 +00:00
Konstantinos Menychtas
fe281e20be am d886ba21: am 2235ef28: (-s ours) 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 a
* commit 'd886ba21b1f9f9ccd0dd0fab17f58d280470f7b1':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 17:06:56 +00:00
Nick Kralevich
6d181dc06a am 63c3068a: am 8314da1c: 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 '63c3068ac343cec183bff4afd5fd05dbbf3ccede':
  Bump revision number for all system images
2015-08-08 17:06:55 +00:00
Nick Kralevich
5fc6ca1190 am d7138ba4: 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 'd7138ba4bf0d0201cceebfd6c5d27585870a7b5f':
2015-08-08 17:01:54 +00:00
Konstantinos Menychtas
d886ba21b1 am 2235ef28: (-s ours) 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 '2235ef28ade5021c9216331519832ca05c93f652':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-08 16:57:07 +00:00
Nick Kralevich
63c3068ac3 am 8314da1c: 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 '8314da1c62d6a19d9e44bb9c32db00c0af02676b':
  Bump revision number for all system images
2015-08-08 16:57:06 +00:00
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
7f3cb054fd am 20f4cf0b: am 4b70b572: am 2032317a: am 73e98d27: (-s ours) 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 b
* commit '20f4cf0b0f83a300f4267b56481d5f88d54ac8de':
2015-08-07 23:13:23 +00:00
Konstantinos Menychtas
e8158a8577 am cdb21d5f: am 6dac7dff: am 6c65c2f5: am 895ff7f3: (-s ours) 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 'cdb21d5fdc9ca3d1af16864abf195fecad249c55':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 23:13:22 +00:00
Konstantinos Menychtas
d15073bb6b am 0d68aeab: am d49bca70: am a944d9a6: am 30461421: (-s ours) 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
* commit '0d68aeabb26b33c0a617b337046fa8e21155e23d':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
2015-08-07 23:13:21 +00:00
Konstantinos Menychtas
251bb36d7b am ceef025b: am 5ce76991: am 860c3d7c: am 1bbfccc1: (-s ours) 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 'ceef025b277b430150d6d3961221472197ab8417':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 23:13:19 +00:00
Nick Kralevich
dd48de4dfe am 163341ca: am 89e5f5c1: am c5066d81: am bc7cb7d9: resolved conflicts for merge of 5e69741e to klp-modular-dev
* commit '163341cac33c69e604db1ee0bffd66bfaab2d2c3':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 23:13:17 +00:00
Konstantinos Menychtas
0f528e4f0d am 14c5da2f: resolved conflicts for merge of bbb03147 to lmp-mr1-dev
* commit '14c5da2f86fd8c59f961e6675eeeb4af299a0e18':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 23:13:15 +00: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
20f4cf0b0f am 4b70b572: am 2032317a: am 73e98d27: (-s ours) 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 '4b70b572c48fa025860f66c76e85c9ce84143507':
2015-08-07 23:07:21 +00:00
Konstantinos Menychtas
cdb21d5fdc am 6dac7dff: am 6c65c2f5: am 895ff7f3: (-s ours) 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 '6dac7dffed7dc93ebe574896163158a488cf0901':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 23:07:20 +00:00