Konstantinos Menychtas
14c5da2f86
resolved conflicts for merge of bbb03147 to lmp-mr1-dev
...
Change-Id: If4fe53fed5753076fc4fddb076ed5c4c1f5e9490
2015-08-07 15:08:07 -07:00
Konstantinos Menychtas
bbb0314723
am ac7b67f7: DO NOT MERGE Increase the system-image revision number after opengl bug fix
...
* commit 'ac7b67f7b9203306d17b4dd5751c4086ce495ca5':
DO NOT MERGE Increase the system-image revision number after opengl bug fix
2015-08-07 19:19:01 +00:00
Konstantinos Menychtas
fc4964b9c3
DO NOT MERGE Increase the system-image revision number after opengl bug fix
...
Back-ported bug-fix 5f07d74ad7fb64637cc29405262a9d33fb2f2bff
(opengl: Fix QemuPipeStream::readFully reading beyond end of buffer)
warrants a system image update. This patch increases the revision
number for released images appropriately.
Change-Id: I3c475d2ab7d6702102cb22b602697936eefed19b
2015-07-21 17:00:13 +00:00
Konstantinos Menychtas
ac7b67f7b9
DO NOT MERGE Increase the system-image revision number after opengl bug fix
...
Back-ported bug-fix b6b8deb6abd06f063f546b43b90b1c21028f219c
(opengl: Fix QemuPipeStream::readFully reading beyond end of buffer)
warrants a system image update. This patch increases the revision
number for released images appropriately.
Change-Id: If77312e0441800e9c4d9dbcfc770183ab1a118e9
2015-07-21 16:59:34 +00:00
Trevor Johns
13b15893e3
Update sample browseables
...
Synced to developers/samples/android commit
121d61a3334fd4999d3cb6553f2356eb8893d19b.
Change-Id: I9a8cebc4b0de0e704b1f2172d57a18420cc96b92
2015-04-22 20:21:37 -07:00
Trevor Johns
951e7288e6
Fix browseable category for NfcProvisioning sample
...
Synced with developers/samples/android commit
0a4e12c1bc019a34549c6e88260879e2da49ce7c.
Change-Id: Ia75c0e01ce61679d87ab88e80c6db97006aaa1e0
2015-04-02 13:29:30 -07:00
Trevor Johns
77b5d394ff
Update sdk.atree and samples/browseable for lastest samples release
...
Synced to developers/samples/android commit
97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910.
Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
2015-03-30 16:06:43 -07:00
Xavier Ducrohet
d9e9e60f22
Update build tools version to 22.0.2. DO NOT MERGE.
...
Change-Id: Icb5bb90fe3b7c31059d97d87ed8e44c0d794236e
2015-03-23 14:23:54 -07:00
Xavier Ducrohet
4ea9bca123
Update build tools to 22.0.1. DO NOT MERGE.
...
Bug: 19085051
Change-Id: Ia62982e7bee589c37f8a755d7e6bb51264556412
2015-03-16 15:21:39 -07:00
Deepanshu Gupta
b15f499b97
Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev
2015-03-12 00:33:15 +00:00
Deepanshu Gupta
06f472a302
Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
...
Change-Id: I5060825f330a2da9234744510aa45eb283509113
2015-03-10 17:59:16 -07:00
Xavier Ducrohet
aeb400d30c
Reset support version to <API>.0.0
...
Change-Id: I740e937ee51fcbcd0aafc054138f8939110d7cb6
2015-03-10 15:24:16 -07:00
Xavier Ducrohet
d927351738
Update version of the build tools to be 22.0.0
...
Change-Id: I8c6c1ce2cd78665c7e9e806fabc3e6b94795cfa4
2015-03-02 16:08:59 -08:00
Jim Miller
18c5fb7c2c
Fix the build
...
This API was hidden for MR1.
Bug 19461292
Change-Id: Ib0a5ca536e843c91a142faeeccf684294aa3e274
2015-02-25 10:37:37 -08:00
bohu
6d2c23850e
am b45bd0a4: am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit 'b45bd0a4fa4467b96c2ca64c908268896e502fa9':
Bump revision number for all system images
2015-02-18 00:25:06 +00:00
bohu
08898593f2
am b71024a6: am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit 'b71024a60165e45f896357705714b3bad4021a52':
back port gles fix to api 17
2015-02-18 00:25:05 +00:00
bohu
20601c6a31
am 6a06fb6f: am e06de8c0: am 3ef1f569: am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit '6a06fb6f66e554b176887f7045afd2d52c40c4a4':
Bump revision number for all the system images
2015-02-18 00:25:04 +00:00
bohu
36bff11258
am 3ce7eb80: am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit '3ce7eb80550ee884b3aa72a0165d888938fb5a6e':
Bump revision number for system images
2015-02-18 00:25:03 +00:00
bohu
b45bd0a4fa
am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit 'fbfb579487c597400ede7fc206d2305e013656ee':
Bump revision number for all system images
2015-02-17 18:46:57 +00:00
bohu
b71024a601
am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '301114084a1fa967b04e9a467499c1290eb4a40c':
back port gles fix to api 17
2015-02-17 18:46:55 +00:00
bohu
6a06fb6f66
am e06de8c0: am 3ef1f569: am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit 'e06de8c0e655bc49a2d45bfb928d2c9446037b23':
Bump revision number for all the system images
2015-02-17 18:46:54 +00:00
bohu
3ce7eb8055
am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit 'db8737c81eecd336c9a3fb7a3947fd4bfc5654d4':
Bump revision number for system images
2015-02-17 18:46:53 +00:00
bohu
fbfb579487
am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit 'c7a591c2cae582fca277f7061565bdeb32af1500':
Bump revision number for all system images
2015-02-17 18:40:14 +00:00
bohu
301114084a
am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '56957bdbde0931bcea54ddfcd83309c398ca1096':
back port gles fix to api 17
2015-02-17 18:40:10 +00:00
bohu
e06de8c0e6
am 3ef1f569: am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit '3ef1f56902270807dc089868b0325e21ae9cc093':
Bump revision number for all the system images
2015-02-17 18:40:07 +00:00
bohu
db8737c81e
am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit 'a706d1c0217936c6624dccee920049a4cf6f0582':
Bump revision number for system images
2015-02-17 18:40:03 +00:00
bohu
c7a591c2ca
am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit '6a59f8ca3e9b49a6e9040ac518f8b7983bed4846':
Bump revision number for all system images
2015-02-17 18:34:46 +00:00
bohu
56957bdbde
am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '7838df56fe230225a0bb4c2ed630adf58c69f9e1':
back port gles fix to api 17
2015-02-17 18:34:44 +00:00
bohu
3ef1f56902
am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit 'fc31df1f124949003cec31b6d009afba78eb571e':
Bump revision number for all the system images
2015-02-17 18:34:43 +00:00
bohu
a706d1c021
am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
...
* commit '21b908bac7f9cd8375062d986cbac899aabf217c':
Bump revision number for system images
2015-02-17 18:34:41 +00:00
bohu
6a59f8ca3e
am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit '4a470965e110af84f4be45fd4171a2a46cffda12':
Bump revision number for all system images
2015-02-13 21:51:12 +00:00
bohu
7838df56fe
am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '423bbda847062e910f292a6eeaa91c246e72e44a':
back port gles fix to api 17
2015-02-13 21:51:11 +00:00
bohu
fc31df1f12
am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit '31e52ee2ac269322ca1fc19de977362ee30f90f9':
Bump revision number for all the system images
2015-02-13 21:51:10 +00:00
bohu
4a470965e1
am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit '2b67d0bf491fcfd2bacb6c00e6d236c15f2936e5':
Bump revision number for all system images
2015-02-13 21:45:36 +00:00
bohu
423bbda847
am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '65325595759d843963881e94aef62c74725ef1fc':
back port gles fix to api 17
2015-02-13 21:45:34 +00:00
bohu
31e52ee2ac
am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit '65cc9c99ae3fe86d0c845a628f11bc93e7b07b90':
Bump revision number for all the system images
2015-02-13 21:45:32 +00:00
bohu
2b67d0bf49
am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit '32912fff64fb28c8ba478cdb0615eda7205a4171':
Bump revision number for all system images
2015-02-13 21:35:16 +00:00
bohu
6532559575
am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '05ecbe5f55d71b469aae58f838279e454380186b':
back port gles fix to api 17
2015-02-13 21:35:15 +00:00
bohu
32912fff64
am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit '89a4eab81cf1829d7bbe888e65c95b628d1694e4':
Bump revision number for all system images
2015-02-13 21:27:48 +00:00
bohu
05ecbe5f55
am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '9bdb1793b0d7b02f626d853a44f4adbe6847366e':
back port gles fix to api 17
2015-02-13 21:27:47 +00:00
bohu
89a4eab81c
am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit 'df57d4596f04d2c0b0dccc2e48e1b8104c9f5c25':
Bump revision number for all system images
2015-02-13 21:23:18 +00:00
bohu
9bdb1793b0
am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '7ef22839c336926a16072ea0e5d83dd125bd0b2f':
back port gles fix to api 17
2015-02-13 21:23:17 +00:00
bohu
65cc9c99ae
am cfff3894: am 5e44138c: Bump revision number for all the system images
...
* commit 'cfff3894e3d18816769eb574f9d6204e6926c571':
Bump revision number for all the system images
2015-02-13 20:55:15 +00:00
bohu
cfff3894e3
am 5e44138c: Bump revision number for all the system images
...
* commit '5e44138c090c13b4f04a2e57a514806d531e119a':
Bump revision number for all the system images
2015-02-13 20:41:37 +00:00
bohu
df57d4596f
am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit '6e780525205e15aff89f00b1642401f309d2f0c4':
Bump revision number for all system images
2015-02-13 20:37:13 +00:00
bohu
7ef22839c3
am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit '8ec8f605e13cf601340c75d450fe2af294c2ecbc':
back port gles fix to api 17
2015-02-13 20:37:10 +00:00
bohu
21b908bac7
am 33bd8cb7: Bump revision number for system images
...
* commit '33bd8cb700b402769ecb6532ee684ea78b41c708':
Bump revision number for system images
2015-02-13 20:31:02 +00:00
bohu
6e78052520
am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit 'f0f43b70aa34aa2bef740c37bb152eb14ef3bccb':
Bump revision number for all system images
2015-02-13 20:26:47 +00:00
bohu
8ec8f605e1
am e591d22b: am f8ac5e31: back port gles fix to api 17
...
* commit 'e591d22bb0cadf6c9f33f892e546f72125483718':
back port gles fix to api 17
2015-02-13 20:26:45 +00:00
bohu
f0f43b70aa
am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
...
* commit '7bf71cfb0934b1578058242d7a0c3b5f84ca00d3':
Bump revision number for all system images
2015-02-13 20:22:38 +00:00
