aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add openide-util-lookup java libHEADreplicant-6.0-0001replicant-6.0Wolfgang Wiedmeyer2016-01-281-0/+1
| | | | | | | On Debian, not all of the needed openide-util classes are in the openide-util lib, so the lookup lib has to be added Change-Id: I15ad4387a9f6d4de5c3a1cba0ffd9ff6ce0154a0 Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
* am 61f99f13: am 245b5ea5: am 2af77026: am 67506023: am 05185e0e: am ↵Konstantinos Menychtas2015-08-110-0/+0
|\ | | | | | | | | | | | | 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '61f99f13140701092d7b6a49d3d26e454f463d8d': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| * am 245b5ea5: am 2af77026: am 67506023: am 05185e0e: am 48812401: am ↵Konstantinos Menychtas2015-08-110-0/+0
| |\ | | | | | | | | | | | | | | | | | | 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '245b5ea56cb43b85169caf99fd488b0ac4b27641': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | * am 2af77026: am 67506023: am 05185e0e: am 48812401: am 7f23b1d0: am ↵Konstantinos Menychtas2015-08-110-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '2af77026e7d463da075813aed80babb18370d26a': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | * am 67506023: am 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am ↵Konstantinos Menychtas2015-08-110-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '6750602374af63f543fa65f2e14b5a8cc318df54': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | * am 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am ↵Konstantinos Menychtas2015-08-110-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '05185e0e9d2c5fc6bd381213ddfb374c7583ffb9': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | | * am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am ↵Konstantinos Menychtas2015-08-110-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '48812401e56622fccb2116e381df8e41baaa1400': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | | | * am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved ↵Konstantinos Menychtas2015-08-110-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts for merge of 5830261a to jb-dev-plus-aosp * commit '7f23b1d0dfa045d23b3931a32fd4df2e7f0eef88': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | | | | * am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for ↵Konstantinos Menychtas2015-08-110-0/+0
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge of 5830261a to jb-dev-plus-aosp * commit 'a8f117d38948aa6fba09e3391fb6afdf16f50b14': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | | | | | * am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of ↵Konstantinos Menychtas2015-08-110-0/+0
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5830261a to jb-dev-plus-aosp * commit '5a571de39e9d65971fe0eb10aeb7122cd90db72e': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | | | | | | * am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to ↵Konstantinos Menychtas2015-08-110-0/+0
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev-plus-aosp * commit '1a30e186adf9dfa4b226ee14d58fd09535a98d15': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | | | | | | | * am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aospKonstantinos Menychtas2015-08-110-0/+0
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8f7ca09183d3a1788df46b2479971f6311ce0d9': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
| | | | | | | | | | | * resolved conflicts for merge of 5830261a to jb-dev-plus-aospKonstantinos Menychtas2015-08-090-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b3a1c6dadeaa1afc6423f328b25f13dde196d54
| | | | | | | | | | | | * DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of bufferKonstantinos Menychtas2015-07-211-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --- This is a back-port of AOSP change 4a7e93da by Yu Ning; the description of the original patch follows below --- When GPU emulation is enabled, the emulator sometimes freezes, with an error message in logcat similar to the following: QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address Some users have reported the same issue, e.g.: https://code.google.com/p/android/issues/detail?id=170633 The root cause is that QemuPipeStream::readFully(void *buf, size_t len) may attempt to read beyond (buf + len), resulting in a -EFAULT return value from the goldfish/qemu pipe driver. Fix this bug to improve the stability of the emulator. In addition, - Add more information to the said error message to facilitate future debugging. - Use "%zu" instead of "%d" for logging size_t variables. Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992 Signed-off-by: Yu Ning <yu.ning@intel.com> Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
* | | | | | | | | | | | | am df9c8e86: am 870db7fb: am 1c92675c: Merge "Update ADT plugin with lint ↵Tor Norbye2015-04-091-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API change" into studio-1.3-dev automerge: d21a036 automerge: d26711d * commit 'df9c8e86eaa4ecc8793a8a25c82ed962bd27c16d': Update ADT plugin with lint API change
| * | | | | | | | | | | | am 870db7fb: am 1c92675c: Merge "Update ADT plugin with lint API change" ↵Tor Norbye2015-04-091-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into studio-1.3-dev automerge: d21a036 automerge: d26711d * commit '870db7fbed553540aacd4e23a4383dd5990045ff': Update ADT plugin with lint API change
| | * \ \ \ \ \ \ \ \ \ \ \ am 1c92675c: Merge "Update ADT plugin with lint API change" into ↵Tor Norbye2015-04-091-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.3-dev automerge: d21a036 automerge: d26711d * commit '1c92675c92ed41b9836723d2122802a436e87880': Update ADT plugin with lint API change
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Update ADT plugin with lint API change" into studio-1.3-dev ↵Tor Norbye2015-04-091-1/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d21a036 automerge: d26711d * commit 'd26711d01b2fc32422cdd7eab9288ae08181ff84': Update ADT plugin with lint API change
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Update ADT plugin with lint API change" into studio-1.3-devTor Norbye2015-04-091-1/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d21a036 * commit 'd21a0361cba0b9d32e2dcff8442dc0de80512883': Update ADT plugin with lint API change
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Update ADT plugin with lint API change" into studio-1.3-devTor Norbye2015-04-091-1/+6
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Update ADT plugin with lint API changeTor Norbye2015-04-091-1/+6
| | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie649d5fcea29cfec0cec64833664353ec61ad408
* | | | | | | | | | | | | | | | | am 52ff7c18: am 20d9be71: am ac1d4eda: Merge "Track tools/base API change in ↵Tor Norbye2015-04-071-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse plugin" into studio-1.3-dev automerge: 58a2c55 automerge: 56fe81f * commit '52ff7c18102c06b60a2f80de5f92be072f4ec936': Track tools/base API change in Eclipse plugin
| * | | | | | | | | | | | | | | | am 20d9be71: am ac1d4eda: Merge "Track tools/base API change in Eclipse ↵Tor Norbye2015-04-071-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plugin" into studio-1.3-dev automerge: 58a2c55 automerge: 56fe81f * commit '20d9be71b4b7305f643442942a6faa5df25bfc11': Track tools/base API change in Eclipse plugin
| | * | | | | | | | | | | | | | | am ac1d4eda: Merge "Track tools/base API change in Eclipse plugin" into ↵Tor Norbye2015-04-071-0/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.3-dev automerge: 58a2c55 automerge: 56fe81f * commit 'ac1d4eda49dce252da1fa3f7f02b94acfa0f1c45': Track tools/base API change in Eclipse plugin
| | | * | | | | | | | | | | | | | Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-dev ↵Tor Norbye2015-04-071-0/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 58a2c55 automerge: 56fe81f * commit '56fe81f3228f886778e76a849ff99333bb05c72c': Track tools/base API change in Eclipse plugin
| | | | * | | | | | | | | | | | | Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-devTor Norbye2015-04-071-0/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 58a2c55 * commit '58a2c552e4b18257f993cfd52627003dfb0b2bda': Track tools/base API change in Eclipse plugin
| | | | | * | | | | | | | | | | | Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-devTor Norbye2015-04-071-0/+13
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Track tools/base API change in Eclipse pluginTor Norbye2015-04-061-0/+13
| | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id1f6a80f8465ad97d392cda6083f374490aa8099
* | | | | | | | | | | | | | | | | am 877d3a06: am 09b94fbb: am f9a43730: Merge "Update easymock version to ↵Siva Velusamy2015-04-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3.3" into studio-1.3-dev automerge: 1765a16 automerge: eb034a7 * commit '877d3a06a4675b43b4a27abec7b44877742b5124': Update easymock version to 3.3
| * | | | | | | | | | | | | | | | am 09b94fbb: am f9a43730: Merge "Update easymock version to 3.3" into ↵Siva Velusamy2015-04-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.3-dev automerge: 1765a16 automerge: eb034a7 * commit '09b94fbb5d9cc73f0a4bcbf2a019b7f017e0db7a': Update easymock version to 3.3
| | * | | | | | | | | | | | | | | am f9a43730: Merge "Update easymock version to 3.3" into studio-1.3-dev ↵Siva Velusamy2015-04-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 1765a16 automerge: eb034a7 * commit 'f9a43730066cafd05fbc11c9fbcea5a2e48d8658': Update easymock version to 3.3
| | | * | | | | | | | | | | | | | Merge "Update easymock version to 3.3" into studio-1.3-dev automerge: 1765a16Siva Velusamy2015-04-071-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: eb034a7 * commit 'eb034a75e79556e0fe8b25453b422b2901a3b853': Update easymock version to 3.3
| | | | * | | | | | | | | | | | | Merge "Update easymock version to 3.3" into studio-1.3-devSiva Velusamy2015-04-071-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 1765a16 * commit '1765a16a16ac2d98465926990e2478665eede3da': Update easymock version to 3.3
| | | | | * | | | | | | | | | | | Merge "Update easymock version to 3.3" into studio-1.3-devSiva Velusamy2015-04-071-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Update easymock version to 3.3Siva Velusamy2015-04-061-1/+1
| | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic34fe3940f5514b19a52fc3e5046cce8cd6ec3ce
* | | | | | | | | | | | | | | | | am 8f178abd: am e5ffd506: am e6aac48c: Merge "Move to the new ↵Deepanshu Gupta2015-04-021-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutlibCallback." into studio-1.3-dev automerge: 80e3ce8 automerge: bd79a42 * commit '8f178abd2019be9ad86ccfa386d4954d0f30c928': Move to the new LayoutlibCallback.
| * | | | | | | | | | | | | | | | am e5ffd506: am e6aac48c: Merge "Move to the new LayoutlibCallback." into ↵Deepanshu Gupta2015-04-021-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | studio-1.3-dev automerge: 80e3ce8 automerge: bd79a42 * commit 'e5ffd50658fa8ded32def4f76ac63e3d65f1dfeb': Move to the new LayoutlibCallback.
| | * | | | | | | | | | | | | | | am e6aac48c: Merge "Move to the new LayoutlibCallback." into studio-1.3-dev ↵Deepanshu Gupta2015-04-021-4/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 80e3ce8 automerge: bd79a42 * commit 'e6aac48c7da09c20abcafba8ab003848aa8448bc': Move to the new LayoutlibCallback.
| | | * | | | | | | | | | | | | | Merge "Move to the new LayoutlibCallback." into studio-1.3-dev automerge: ↵Deepanshu Gupta2015-04-021-4/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80e3ce8 automerge: bd79a42 * commit 'bd79a42f7f0759858321a930c9faed6140ae85f2': Move to the new LayoutlibCallback.
| | | | * | | | | | | | | | | | | Merge "Move to the new LayoutlibCallback." into studio-1.3-devDeepanshu Gupta2015-04-021-4/+10
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 80e3ce8 * commit '80e3ce8bd4f4daf0c64de75f99e0d6bec06cbcba': Move to the new LayoutlibCallback.
| | | | | * | | | | | | | | | | | Merge "Move to the new LayoutlibCallback." into studio-1.3-devDeepanshu Gupta2015-04-021-4/+10
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Move to the new LayoutlibCallback.Deepanshu Gupta2015-04-021-4/+10
| | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LegacyCallback will be removed shortly. The change moves to the new LayoutlibCallback. Also implement the newly added supports() method. Change-Id: If0871d56a83818d29112f07f29b3b77b401b4fb9
* | | | | | | | | | | | | | | | | am b258ed26: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ↵Qiwen Zhao2015-03-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE ANYWHERE. * commit 'b258ed266c215d3fa665fb5bee0c9112e6cf6e08':
| * | | | | | | | | | | | | | | | reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am cb1da5eb: am a0bf2fac: Merge "Update tools to revision 23.0.4" into idea133Siva Velusamy2015-03-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb1da5eb45d6ac83f4861da18b8a3f89ee60fc91': Update tools to revision 23.0.4
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d20c6a5c: am e3be25a2: Merge "Update ADT version to 23.0.4" into idea133Raphael Moll2015-03-2053-77/+77
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd20c6a5c06cd222e55dca208d130ba91c4b933a1': Update ADT version to 23.0.4
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2bee0c98: am 9c676ef4: Merge "Match language-specific flags before ↵Tor Norbye2015-03-201-11/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default locale country matches" into idea133 automerge: 1687a96 * commit '2bee0c98829bee078940af9d864a05ff0c22486e': Match language-specific flags before default locale country matches
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ddb5d875: am 972e1c6d: Merge "emulator/opengl: Cleanup build files + ↵David 'Digit' Turner2015-03-2062-6756/+84
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove obsolete tests." * commit 'ddb5d875c38022441d4b2e9de3b874b5e1c4df9b': emulator/opengl: Cleanup build files + remove obsolete tests.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 35e336b1: am 956b01fd: Merge "gltrace: Increase launch timeout" into ↵Siva Velusamy2015-03-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | idea133 automerge: 1d55d41 * commit '35e336b1c6378da70c891ad68ebee662414b52c1': gltrace: Increase launch timeout
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 44021bc2: am 39f4d677: Merge "Change Device List to Device Collection." ↵Deepanshu Gupta2015-03-208-21/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into idea133 automerge: b0e06f6 * commit '44021bc2138bd92889328f699887fafa40e2ecc6': Change Device List to Device Collection.
generated by cgit v1.1 at 2024-12-22 12:13:47 +0000