OSDN Git Service
Deepanshu Gupta [Thu, 30 Jan 2014 02:49:24 +0000 (18:49 -0800)]
am
9731f579: Merge "Manual merge of changes from klp-dev"
* commit '
9731f5796c40dd366121b543d08217c5d3a63b36':
Manual merge of changes from klp-dev
Deepanshu Gupta [Thu, 30 Jan 2014 02:47:16 +0000 (02:47 +0000)]
Merge "Manual merge of changes from klp-dev"
Adam Koch [Thu, 30 Jan 2014 02:02:45 +0000 (18:02 -0800)]
am
268d7ad3: am
310b1e51: am
af5b2d3f: am
6e1ce75f: am
b430d93b: am
cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
* commit '
268d7ad32995b3c4a9dfe4981878946db6d29ef4':
Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659
Adam Koch [Thu, 30 Jan 2014 01:58:22 +0000 (01:58 +0000)]
am
310b1e51: am
af5b2d3f: am
6e1ce75f: am
b430d93b: am
cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
* commit '
310b1e511f92c6972ccda2c7a779116fc0f89ced':
Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659
Deepanshu Gupta [Mon, 27 Jan 2014 19:45:47 +0000 (11:45 -0800)]
ztenghui [Wed, 29 Jan 2014 23:46:56 +0000 (15:46 -0800)]
am
f3560a13: Merge "Merge close vertices in a better way."
* commit '
f3560a133e3ec19c698a8c9d6cfc7d17fd95adc5':
Merge close vertices in a better way.
ztenghui [Wed, 29 Jan 2014 23:45:12 +0000 (23:45 +0000)]
Merge "Merge close vertices in a better way."
Chris Craik [Wed, 29 Jan 2014 23:35:59 +0000 (15:35 -0800)]
am
f5b5482d: Merge "Fix build breakage"
* commit '
f5b5482dcab2a87beacc36b25fe54cfec8923714':
Fix build breakage
Chris Craik [Wed, 29 Jan 2014 23:32:52 +0000 (23:32 +0000)]
Merge "Fix build breakage"
Chris Craik [Wed, 29 Jan 2014 23:30:18 +0000 (15:30 -0800)]
Fix build breakage
Change-Id: I65ab3cb691935db23b7a1f600e421fb5d8e850cd
Adam Koch [Wed, 29 Jan 2014 23:15:16 +0000 (23:15 +0000)]
am
af5b2d3f: am
6e1ce75f: am
b430d93b: am
cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
* commit '
af5b2d3f2308296a7dec93e4f790fb587cd86197':
Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659
Adam Koch [Wed, 29 Jan 2014 23:12:52 +0000 (23:12 +0000)]
am
6e1ce75f: am
b430d93b: am
cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
* commit '
6e1ce75f4c45e91cdc4442cc6c3d823017c7de4d':
Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659
Adam Koch [Wed, 29 Jan 2014 23:09:58 +0000 (23:09 +0000)]
am
b430d93b: am
cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
* commit '
b430d93b058a706be731e45f8c1836d97219a666':
Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659
Adam Koch [Wed, 29 Jan 2014 23:06:46 +0000 (23:06 +0000)]
am
cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
* commit '
cb3ea3d47449a669e0d28131cf9254d5476bae73':
Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659
Adam Koch [Wed, 29 Jan 2014 23:04:02 +0000 (23:04 +0000)]
Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
Chris Craik [Wed, 29 Jan 2014 22:54:11 +0000 (14:54 -0800)]
am
de439dbe: Merge "Update reordering method names, and make 3d reordering API public"
* commit '
de439dbe2c395a0c61331ffad567af1124782e6b':
Update reordering method names, and make 3d reordering API public
Chris Craik [Wed, 29 Jan 2014 22:51:29 +0000 (22:51 +0000)]
Merge "Update reordering method names, and make 3d reordering API public"
Chris Craik [Sun, 26 Jan 2014 19:30:58 +0000 (11:30 -0800)]
Update reordering method names, and make 3d reordering API public
IsContainedVolume -> hasIsolatedZVolume conveys that this affects Z
ordering of views
ProjectToContainedBackground -> ProjectBackwards, since it ended up
using its own projection target, separate from the 3d volume bit
Change-Id: Ia2cde838cc4da134366fe6ff623290fbd65e50c3
Christopher Tate [Wed, 29 Jan 2014 21:45:04 +0000 (13:45 -0800)]
am
5e31fdba: Merge "Adapt to underlying changes in the PBKDF2 implementation"
* commit '
5e31fdbacd11fa3750b82004aa80cef0260951e9':
Adapt to underlying changes in the PBKDF2 implementation
Christopher Tate [Wed, 29 Jan 2014 21:42:57 +0000 (21:42 +0000)]
Merge "Adapt to underlying changes in the PBKDF2 implementation"
Chris Craik [Wed, 29 Jan 2014 21:22:44 +0000 (13:22 -0800)]
am
967c7fb2: Merge "Fix projection offset caching"
* commit '
967c7fb2af23cbdadba45f9113cbcaa9f55c3f24':
Fix projection offset caching
Chris Craik [Wed, 29 Jan 2014 21:20:36 +0000 (21:20 +0000)]
Merge "Fix projection offset caching"
Chong Zhang [Wed, 29 Jan 2014 21:12:05 +0000 (13:12 -0800)]
am
2f03f90d: Merge "change Surface constructor arg to 64bit"
* commit '
2f03f90d859ee57525178750b19444591174e3a5':
change Surface constructor arg to 64bit
Chong Zhang [Wed, 29 Jan 2014 21:09:20 +0000 (21:09 +0000)]
Merge "change Surface constructor arg to 64bit"
Chong Zhang [Wed, 29 Jan 2014 20:52:15 +0000 (12:52 -0800)]
change Surface constructor arg to 64bit
Bug:
12799017
Bug:
12799384
Change-Id: Ic16b4fa5394df38cee0378b6e00d1808b9c8cb94
Chris Craik [Wed, 29 Jan 2014 21:00:33 +0000 (13:00 -0800)]
Fix projection offset caching
Because the caching of projection matrix didn't account for changes in
the offset flag, the flag could be ignored. Now we use both to verify
that the cached matrix can be used.
Change-Id: I193b94eaf0b98f046a6484f0866c3d25048653fd
Dan Sandler [Wed, 29 Jan 2014 17:28:30 +0000 (09:28 -0800)]
am
4d67c3a0: Merge "Fix NPE in empty SizeAdaptiveLayouts."
* commit '
4d67c3a0702dbddf0c4e810e0fd545259c6f2049':
Fix NPE in empty SizeAdaptiveLayouts.
Dan Sandler [Wed, 29 Jan 2014 17:26:31 +0000 (17:26 +0000)]
Merge "Fix NPE in empty SizeAdaptiveLayouts."
ztenghui [Mon, 27 Jan 2014 23:53:28 +0000 (15:53 -0800)]
Merge close vertices in a better way.
And add more verification code for testing purpose.
Change-Id: I5bc4f69e6582c02fd03106af9a98abd05a6755b7
John Spurlock [Wed, 29 Jan 2014 15:54:54 +0000 (07:54 -0800)]
am
77b17f33: am
2ad24e74: am
15c09e1e: am
0dbcd7d9: am
2d35ba4d: am
d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
* commit '
77b17f335decdc0e6da0eb657ad214638795137d':
[Navigation bar] Allow "right to left" gesture to launch search panel
John Spurlock [Wed, 29 Jan 2014 15:52:15 +0000 (15:52 +0000)]
am
2ad24e74: am
15c09e1e: am
0dbcd7d9: am
2d35ba4d: am
d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
* commit '
2ad24e74f5ea206d737bad4253f33504a542eaba':
[Navigation bar] Allow "right to left" gesture to launch search panel
Narayan Kamath [Wed, 29 Jan 2014 15:51:30 +0000 (07:51 -0800)]
am
1e7011fb: Merge "Path.native_trim should return long, not int."
* commit '
1e7011fb2903b6b10a78890b2f85ca026e49b168':
Path.native_trim should return long, not int.
John Spurlock [Wed, 29 Jan 2014 15:49:20 +0000 (15:49 +0000)]
am
15c09e1e: am
0dbcd7d9: am
2d35ba4d: am
d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
* commit '
15c09e1e2f55fbca9ddafa4227ef30a6dbefa664':
[Navigation bar] Allow "right to left" gesture to launch search panel
Narayan Kamath [Wed, 29 Jan 2014 15:48:11 +0000 (15:48 +0000)]
Merge "Path.native_trim should return long, not int."
John Spurlock [Wed, 29 Jan 2014 15:46:30 +0000 (15:46 +0000)]
am
0dbcd7d9: am
2d35ba4d: am
d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
* commit '
0dbcd7d99f37967f2ee7a8fad113df97b6a94fe7':
[Navigation bar] Allow "right to left" gesture to launch search panel
Narayan Kamath [Wed, 29 Jan 2014 15:43:56 +0000 (07:43 -0800)]
am
9932d648: am
1a6e29aa: am
d933edc7: am
9ecada44: am
dfd4f523: am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
9932d648834a8fae4f98e6985ce1112ddf28da0b':
mNativeCanvas is long, not int.
John Spurlock [Wed, 29 Jan 2014 15:42:34 +0000 (15:42 +0000)]
am
2d35ba4d: am
d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
* commit '
2d35ba4d4a43036706638ca0e96e5e1a9904d2af':
[Navigation bar] Allow "right to left" gesture to launch search panel
Narayan Kamath [Wed, 29 Jan 2014 15:40:59 +0000 (15:40 +0000)]
am
1a6e29aa: am
d933edc7: am
9ecada44: am
dfd4f523: am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
1a6e29aae589073bfd6bd5f42816e622584cfb7a':
mNativeCanvas is long, not int.
John Spurlock [Wed, 29 Jan 2014 15:40:00 +0000 (07:40 -0800)]
am
d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
* commit '
d12f4eb8cb986d710aaf98a9d6b8f66803d182d6':
[Navigation bar] Allow "right to left" gesture to launch search panel
Narayan Kamath [Wed, 29 Jan 2014 15:38:42 +0000 (15:38 +0000)]
am
d933edc7: am
9ecada44: am
dfd4f523: am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
d933edc742dcaf96862b211f4641e4cfd98acef5':
mNativeCanvas is long, not int.
John Spurlock [Wed, 29 Jan 2014 15:36:40 +0000 (15:36 +0000)]
Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
Narayan Kamath [Wed, 29 Jan 2014 15:33:48 +0000 (15:33 +0000)]
am
9ecada44: am
dfd4f523: am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
9ecada44042c49516d781281bbe0cba4e0af51a2':
mNativeCanvas is long, not int.
Narayan Kamath [Wed, 29 Jan 2014 15:29:23 +0000 (15:29 +0000)]
am
dfd4f523: am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
dfd4f5232c87c51fe639b594fd210b4073eca42b':
mNativeCanvas is long, not int.
Narayan Kamath [Wed, 29 Jan 2014 15:29:00 +0000 (07:29 -0800)]
am
c2cf1e1d: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
c2cf1e1df4117351e58950c8a20e3095cb7a06ed':
AArch64: Use of long for pointers in PropertyValuesHolder
Narayan Kamath [Wed, 29 Jan 2014 15:26:47 +0000 (15:26 +0000)]
Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
Narayan Kamath [Wed, 29 Jan 2014 15:26:19 +0000 (07:26 -0800)]
am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
d228a03891f60520d517b2a3bc900b008b2da702':
mNativeCanvas is long, not int.
Evan Charlton [Wed, 29 Jan 2014 15:02:20 +0000 (07:02 -0800)]
am
33da8dde: Merge "Allow for a configurable WiFi restore bounce delay"
* commit '
33da8dde5f3e37f7097e59ad2d67e3e9f54b7436':
Allow for a configurable WiFi restore bounce delay
Narayan Kamath [Wed, 29 Jan 2014 15:02:05 +0000 (15:02 +0000)]
Merge "mNativeCanvas is long, not int."
Evan Charlton [Wed, 29 Jan 2014 14:58:27 +0000 (14:58 +0000)]
Merge "Allow for a configurable WiFi restore bounce delay"
Narayan Kamath [Wed, 29 Jan 2014 13:02:46 +0000 (05:02 -0800)]
am
11f66d08: am
1caea796: am
c74f7619: am
cdc095ae: am
7be33110: am
d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
* commit '
11f66d0874669cb23be87202f84b98be9ea7bbc8':
AArch64: Use long for pointers in graphics/Interpolator
Narayan Kamath [Wed, 29 Jan 2014 13:02:42 +0000 (05:02 -0800)]
am
c42de09a: am
67ac8120: am
0cc4bb1f: am
e4fc5c17: am
74db9ddb: am
887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
* commit '
c42de09a947fa511cc75a624c40b2d2816b8c0ee':
AArch64: Use long for pointers in SurfaceTexture
Narayan Kamath [Wed, 29 Jan 2014 13:02:39 +0000 (05:02 -0800)]
am
38885b63: am
38638b2f: am
eaae9906: am
672f3ee3: am
95ba1eb6: am
dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
* commit '
38885b63fc41e664681b6fd12159c7ce04e3addc':
AArch64: Use long for pointers in DRM classes
Narayan Kamath [Wed, 29 Jan 2014 13:02:28 +0000 (05:02 -0800)]
am
ef099b71: am
4a587146: am
09d07d0d: am
e3e4b405: am
9846fb69: am
50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit '
ef099b71838e15758c8e859af21748a123bb4a99':
AArch64: Make Binder and Parcel 64-bit compatible
Scott Main [Wed, 29 Jan 2014 13:02:26 +0000 (05:02 -0800)]
am
0b4e9b67: am
3e35a2c3: am
5a0b40d4: am
f088add7: am
80cbc73f: am
e535499e: Merge "add api notice to cast package index" into klp-docs
* commit '
0b4e9b674fd5367db7af6aaf147fb141d79ea617':
add api notice to cast package index
Scott Main [Wed, 29 Jan 2014 13:02:23 +0000 (05:02 -0800)]
am
99fec5df: am
6fe01375: am
d50aaefd: am
66c82a8a: am
28c42122: am
c62223a0: add api notice to a bunch more files in iberico release
* commit '
99fec5df7ff3449f9e58af2e7322635fe91f7b8c':
add api notice to a bunch more files in iberico release
Scott Main [Wed, 29 Jan 2014 13:02:20 +0000 (05:02 -0800)]
am
ab3269ad: am
03cc03a3: am
f81a02a3: am
9cc6eb7b: am
da59b9c1: am
e7249902: add warning to all the new iberico API pages about SDK not available yet
* commit '
ab3269ad4c279dd22c5ffad10303ebcba84b0468':
add warning to all the new iberico API pages about SDK not available yet
quddusc [Wed, 29 Jan 2014 13:02:15 +0000 (05:02 -0800)]
am
913d1546: am
517b322f: am
299cd65e: am
c73d1d4a: am
c4cba0e9: am
32993c68: docs: Added API reference docs for GCore Iberico release.
* commit '
913d15460e0d993fef6fa8062a47eedb4521cbe1':
docs: Added API reference docs for GCore Iberico release.
Scott Main [Wed, 29 Jan 2014 13:02:12 +0000 (05:02 -0800)]
am
be305605: am
ee209289: am
dd5b4cc9: am
3b9b40f7: am
31db1bba: am
cf010ab9: add google cast feature page
* commit '
be3056050ddba0934ddea2ea2e5b001636f40a58':
add google cast feature page
Scott Main [Wed, 29 Jan 2014 13:01:47 +0000 (05:01 -0800)]
am
1406a220: am
92424e46: am
66b6ae35: am
c510adb7: am
2d27da36: am
3781318f: add Cast to the sidenav
* commit '
1406a2203fdbc5172ab517b3a023d3331f0e419d':
add Cast to the sidenav
Mark Salyzyn [Wed, 29 Jan 2014 13:01:44 +0000 (05:01 -0800)]
am
97cae3ea: am
c0b540dc: am
8bb5e662: am
d732f561: am
2c6b048b: am
967c5d00: Merge changes I3659193f,I8b78e4db
* commit '
97cae3eae6c9abbd74ff4206dcaba350caafb99b':
jni: Resolve build warnings
jni: Incorporate liblog reading API
Narayan Kamath [Wed, 29 Jan 2014 12:50:20 +0000 (12:50 +0000)]
am
1caea796: am
c74f7619: am
cdc095ae: am
7be33110: am
d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
* commit '
1caea796c9f3154048c02db6f46c458e8a80c32c':
AArch64: Use long for pointers in graphics/Interpolator
Narayan Kamath [Wed, 29 Jan 2014 12:50:15 +0000 (12:50 +0000)]
am
67ac8120: am
0cc4bb1f: am
e4fc5c17: am
74db9ddb: am
887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
* commit '
67ac8120bf4e01b1de9d46673142d7fb92615616':
AArch64: Use long for pointers in SurfaceTexture
Narayan Kamath [Wed, 29 Jan 2014 12:50:09 +0000 (12:50 +0000)]
am
38638b2f: am
eaae9906: am
672f3ee3: am
95ba1eb6: am
dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
* commit '
38638b2fcc4aba428889d521d83762d716e32332':
AArch64: Use long for pointers in DRM classes
Narayan Kamath [Wed, 29 Jan 2014 12:50:02 +0000 (12:50 +0000)]
am
4a587146: am
09d07d0d: am
e3e4b405: am
9846fb69: am
50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit '
4a58714606fdeb2e740b0ce51ea5074783e2ecf4':
AArch64: Make Binder and Parcel 64-bit compatible
Scott Main [Wed, 29 Jan 2014 12:49:51 +0000 (12:49 +0000)]
am
3e35a2c3: am
5a0b40d4: am
f088add7: am
80cbc73f: am
e535499e: Merge "add api notice to cast package index" into klp-docs
* commit '
3e35a2c3b702777527da74e4672bddd1f593a1c9':
add api notice to cast package index
Scott Main [Wed, 29 Jan 2014 12:49:45 +0000 (12:49 +0000)]
am
6fe01375: am
d50aaefd: am
66c82a8a: am
28c42122: am
c62223a0: add api notice to a bunch more files in iberico release
* commit '
6fe01375532d11d4fd710b4d7c7d0899ed6f548e':
add api notice to a bunch more files in iberico release
Scott Main [Wed, 29 Jan 2014 12:49:38 +0000 (12:49 +0000)]
am
03cc03a3: am
f81a02a3: am
9cc6eb7b: am
da59b9c1: am
e7249902: add warning to all the new iberico API pages about SDK not available yet
* commit '
03cc03a32c0cfa5368903d389c102baa129c6da9':
add warning to all the new iberico API pages about SDK not available yet
quddusc [Wed, 29 Jan 2014 12:49:22 +0000 (12:49 +0000)]
am
517b322f: am
299cd65e: am
c73d1d4a: am
c4cba0e9: am
32993c68: docs: Added API reference docs for GCore Iberico release.
* commit '
517b322f091bdbfb8b82c0d57895f20b95fee6a3':
docs: Added API reference docs for GCore Iberico release.
Scott Main [Wed, 29 Jan 2014 12:49:15 +0000 (12:49 +0000)]
am
ee209289: am
dd5b4cc9: am
3b9b40f7: am
31db1bba: am
cf010ab9: add google cast feature page
* commit '
ee20928913889eace0388f348c09f1f801272fd6':
add google cast feature page
Narayan Kamath [Wed, 29 Jan 2014 12:23:45 +0000 (12:23 +0000)]
am
c74f7619: am
cdc095ae: am
7be33110: am
d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
* commit '
c74f7619e19f4d172fc0bc6220abc917024c45b0':
AArch64: Use long for pointers in graphics/Interpolator
Narayan Kamath [Wed, 29 Jan 2014 12:23:40 +0000 (12:23 +0000)]
am
0cc4bb1f: am
e4fc5c17: am
74db9ddb: am
887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
* commit '
0cc4bb1ff30a7e2ef96837b1dbe79a89d5145dc2':
AArch64: Use long for pointers in SurfaceTexture
Narayan Kamath [Wed, 29 Jan 2014 12:21:32 +0000 (12:21 +0000)]
mNativeCanvas is long, not int.
swapNativeCanvas was asking for an int field.
Change-Id: I660fb13ecfb5d3b24201676dc03c16d61c92af07
Narayan Kamath [Wed, 29 Jan 2014 12:21:21 +0000 (12:21 +0000)]
am
cdc095ae: am
7be33110: am
d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
* commit '
cdc095ae4850d9ffd08de0d6e8828949603fcdd1':
AArch64: Use long for pointers in graphics/Interpolator
Narayan Kamath [Wed, 29 Jan 2014 12:21:11 +0000 (12:21 +0000)]
am
e4fc5c17: am
74db9ddb: am
887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
* commit '
e4fc5c17c092a77e0647e01e93a6b0e806c27692':
AArch64: Use long for pointers in SurfaceTexture
Scott Main [Wed, 29 Jan 2014 12:20:54 +0000 (12:20 +0000)]
am
92424e46: am
66b6ae35: am
c510adb7: am
2d27da36: am
3781318f: add Cast to the sidenav
* commit '
92424e46ef6247e78c31d0f3dc68b62c78d12117':
add Cast to the sidenav
Mark Salyzyn [Wed, 29 Jan 2014 12:20:15 +0000 (12:20 +0000)]
am
c0b540dc: am
8bb5e662: am
d732f561: am
2c6b048b: am
967c5d00: Merge changes I3659193f,I8b78e4db
* commit '
c0b540dc8744eceabfcf09a45ec964cb9709027a':
jni: Resolve build warnings
jni: Incorporate liblog reading API
Narayan Kamath [Wed, 29 Jan 2014 12:18:31 +0000 (12:18 +0000)]
am
7be33110: am
d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
* commit '
7be33110ea3e1a032ee3aa7c50f1dedf52fcab25':
AArch64: Use long for pointers in graphics/Interpolator
Narayan Kamath [Wed, 29 Jan 2014 12:18:27 +0000 (12:18 +0000)]
am
74db9ddb: am
887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
* commit '
74db9ddb341d9d7dafe36b2bc74e3aaf50dd3160':
AArch64: Use long for pointers in SurfaceTexture
Narayan Kamath [Wed, 29 Jan 2014 12:14:48 +0000 (04:14 -0800)]
am
d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
* commit '
d4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3':
AArch64: Use long for pointers in graphics/Interpolator
Narayan Kamath [Wed, 29 Jan 2014 12:14:44 +0000 (04:14 -0800)]
am
887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
* commit '
887b1ca87941095797a246b2d68ec2626a7cfc43':
AArch64: Use long for pointers in SurfaceTexture
Narayan Kamath [Wed, 29 Jan 2014 12:12:27 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in graphics/Interpolator"
Narayan Kamath [Wed, 29 Jan 2014 12:12:17 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in SurfaceTexture"
Narayan Kamath [Wed, 29 Jan 2014 12:12:14 +0000 (12:12 +0000)]
am
eaae9906: am
672f3ee3: am
95ba1eb6: am
dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
* commit '
eaae990695df28f00432978c417f7c47752cd6aa':
AArch64: Use long for pointers in DRM classes
Narayan Kamath [Wed, 29 Jan 2014 12:08:57 +0000 (12:08 +0000)]
am
672f3ee3: am
95ba1eb6: am
dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
* commit '
672f3ee33c3e3d76c4b6764fb1dca8c705c159e3':
AArch64: Use long for pointers in DRM classes
Narayan Kamath [Wed, 29 Jan 2014 12:06:26 +0000 (12:06 +0000)]
am
95ba1eb6: am
dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
* commit '
95ba1eb6243a9b356ec4ac02177076e2427360a3':
AArch64: Use long for pointers in DRM classes
Narayan Kamath [Wed, 29 Jan 2014 12:03:16 +0000 (04:03 -0800)]
am
dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
* commit '
dd6de16aee254497040b32cc330b4637b96685c0':
AArch64: Use long for pointers in DRM classes
Narayan Kamath [Wed, 29 Jan 2014 12:00:27 +0000 (12:00 +0000)]
Merge "AArch64: Use long for pointers in DRM classes"
Ashok Bhat [Fri, 17 Jan 2014 16:44:27 +0000 (16:44 +0000)]
AArch64: Use of long for pointers in PropertyValuesHolder
Long is used in PropertyValuesHolder class to store native pointers
as they can be 64-bit. Note that jmethodID, a pointer to structures,
is also carried in long rather than int to support 64-bit system.
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
(cherry picked from commit
0141e884344a5c267239079d615e1c9d9898a222)
Change-Id: I80408a7227427732db0d8b4c960bcb849b7c8060
Narayan Kamath [Wed, 29 Jan 2014 10:54:26 +0000 (10:54 +0000)]
am
09d07d0d: am
e3e4b405: am
9846fb69: am
50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit '
09d07d0d33d44fc87c02a8f607ecb7b96dbb4145':
AArch64: Make Binder and Parcel 64-bit compatible
Narayan Kamath [Wed, 29 Jan 2014 10:51:51 +0000 (10:51 +0000)]
am
e3e4b405: am
9846fb69: am
50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit '
e3e4b40577032f6fad38bfbeb9c2b40df89f0ef9':
AArch64: Make Binder and Parcel 64-bit compatible
Narayan Kamath [Wed, 29 Jan 2014 10:48:52 +0000 (10:48 +0000)]
am
9846fb69: am
50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit '
9846fb695a3c41aabde4ca0061d583b35f9621d1':
AArch64: Make Binder and Parcel 64-bit compatible
Narayan Kamath [Wed, 29 Jan 2014 10:45:12 +0000 (02:45 -0800)]
am
50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit '
50afaefdc09060c7435291bc91aac47295ce2dfd':
AArch64: Make Binder and Parcel 64-bit compatible
Narayan Kamath [Wed, 29 Jan 2014 10:43:22 +0000 (10:43 +0000)]
Merge "AArch64: Make Binder and Parcel 64-bit compatible"
Narayan Kamath [Wed, 29 Jan 2014 09:38:37 +0000 (09:38 +0000)]
Path.native_trim should return long, not int.
Change-Id: Idafc4c58eb86ad1af614d31f8cb05216bd869482
Scott Main [Wed, 29 Jan 2014 08:30:07 +0000 (08:30 +0000)]
am
5a0b40d4: am
f088add7: am
80cbc73f: am
e535499e: Merge "add api notice to cast package index" into klp-docs
* commit '
5a0b40d4981f5a28ab0d8462b35d817df588acf5':
add api notice to cast package index
Scott Main [Wed, 29 Jan 2014 08:30:00 +0000 (08:30 +0000)]
am
d50aaefd: am
66c82a8a: am
28c42122: am
c62223a0: add api notice to a bunch more files in iberico release
* commit '
d50aaefd3ae44072493b6d7fab11976be0c33d53':
add api notice to a bunch more files in iberico release
Scott Main [Wed, 29 Jan 2014 08:27:14 +0000 (08:27 +0000)]
am
f088add7: am
80cbc73f: am
e535499e: Merge "add api notice to cast package index" into klp-docs
* commit '
f088add7f25612a0db7e36a4df0f1c5213899697':
add api notice to cast package index
Scott Main [Wed, 29 Jan 2014 08:27:09 +0000 (08:27 +0000)]
am
66c82a8a: am
28c42122: am
c62223a0: add api notice to a bunch more files in iberico release
* commit '
66c82a8a8e9323a26504c15d4024f5b7cb0f7279':
add api notice to a bunch more files in iberico release
Scott Main [Wed, 29 Jan 2014 08:24:34 +0000 (08:24 +0000)]
am
80cbc73f: am
e535499e: Merge "add api notice to cast package index" into klp-docs
* commit '
80cbc73f657cc6ac5db8bb5529918e9e05edc749':
add api notice to cast package index
Scott Main [Wed, 29 Jan 2014 08:24:28 +0000 (08:24 +0000)]
am
28c42122: am
c62223a0: add api notice to a bunch more files in iberico release
* commit '
28c4212223a033cc65e5b2d8029527d5cb4b40a9':
add api notice to a bunch more files in iberico release
OSDN Git Service
