OSDN Git Service
Scott Main [Tue, 4 Feb 2014 19:19:38 +0000 (19:19 +0000)]
am
eea15edc: am
749120f3: dashbaord update for feb \'14
* commit '
eea15edcd47e6830dd6cdecb2c0b1e26eba0e6e3':
dashbaord update for feb '14
Scott Main [Tue, 4 Feb 2014 19:15:36 +0000 (19:15 +0000)]
am
749120f3: dashbaord update for feb \'14
* commit '
749120f39bdac49a96771d06d25b7f9edf70be67':
dashbaord update for feb '14
Scott Main [Tue, 4 Feb 2014 18:57:47 +0000 (10:57 -0800)]
dashbaord update for feb '14
Change-Id: I7ed66b6603f40cbbf3ffcc4824894777e3f8add2
Glenn Kasten [Tue, 4 Feb 2014 18:32:10 +0000 (18:32 +0000)]
am
983a9381: am
11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '
983a9381b87519ddd1c6e12e44a8762dc805894a':
Add adb over Wi-Fi
Glenn Kasten [Tue, 4 Feb 2014 18:29:17 +0000 (18:29 +0000)]
am
11263b24: Merge "Add adb over Wi-Fi" into klp-docs
* commit '
11263b24230a0d5db363d76ad199d692bcff1b35':
Add adb over Wi-Fi
Glenn Kasten [Tue, 4 Feb 2014 18:27:11 +0000 (18:27 +0000)]
Merge "Add adb over Wi-Fi" into klp-docs
Ricardo Cervera [Tue, 4 Feb 2014 17:24:28 +0000 (17:24 +0000)]
am
b180bff5: am
ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
* commit '
b180bff575b25ab6b692327a3be244310fd90c5e':
docs: Added note on multiple build.gradle files. Bug:
12870006
Ricardo Cervera [Tue, 4 Feb 2014 17:21:18 +0000 (17:21 +0000)]
am
ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
* commit '
ccec0906bd358ffa9fbac8f8c882f582c43b6092':
docs: Added note on multiple build.gradle files. Bug:
12870006
Ricardo Cervera [Tue, 4 Feb 2014 17:18:59 +0000 (17:18 +0000)]
Merge "docs: Added note on multiple build.gradle files. Bug:
12870006" into klp-docs
Scott Main [Tue, 4 Feb 2014 02:06:01 +0000 (02:06 +0000)]
am
28a828fa: am
56783a74: remove samples page under tools. redirect in separate cl. bug:
12878293
* commit '
28a828fa198122a13d053eae2e46f18487818e91':
remove samples page under tools. redirect in separate cl. bug:
12878293
Scott Main [Tue, 4 Feb 2014 02:01:33 +0000 (02:01 +0000)]
am
56783a74: remove samples page under tools. redirect in separate cl. bug:
12878293
* commit '
56783a742458968a6ec5daf4d9e7a72f755f5ce5':
remove samples page under tools. redirect in separate cl. bug:
12878293
Ricardo Cervera [Tue, 4 Feb 2014 01:08:31 +0000 (17:08 -0800)]
docs: Added note on multiple build.gradle files. Bug:
12870006
Change-Id: I44b5152dc753893d3b9f0a0441066a530e5a30f0
Review: http://quixote.mtv.corp.google.com:8006/google/play-services/setup.html
Scott Main [Tue, 4 Feb 2014 01:07:27 +0000 (17:07 -0800)]
remove samples page under tools. redirect in separate cl.
bug:
12878293
Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d
Glenn Kasten [Mon, 3 Feb 2014 22:01:25 +0000 (14:01 -0800)]
Add adb over Wi-Fi
Change-Id: I6ada6c88e3a006abc4685b66d6decd1bec175941
John Spurlock [Mon, 3 Feb 2014 17:21:25 +0000 (17:21 +0000)]
am
76ecd66a: am
0196e561: Fix typo in ImageView.java
* commit '
76ecd66a6d5f8ceaebbe9cd109948f01aff4cd27':
Fix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 17:18:37 +0000 (17:18 +0000)]
am
0196e561: Fix typo in ImageView.java
* commit '
0196e561f280e6cc361442036da277a630e68558':
Fix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 14:00:35 +0000 (09:00 -0500)]
Fix typo in ImageView.java
Change-Id: Iaa7b020f09c893a5fe006a8523686dd8b9a8f872
Scott Main [Thu, 30 Jan 2014 22:10:50 +0000 (22:10 +0000)]
am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
e71cc6fd82df1bf654d72e796ac7975dbf0aff29':
Revert "add Cast to the sidenav"
Scott Main [Thu, 30 Jan 2014 22:10:45 +0000 (22:10 +0000)]
am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
4b1a317abb56dc90efacf86ccd796643b1f02478':
Revert "add google cast feature page"
Scott Main [Thu, 30 Jan 2014 21:52:15 +0000 (21:52 +0000)]
am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
897739f1b7d179cd402fcf907e2ac9751fe44c6d':
Revert "add Cast to the sidenav"
Scott Main [Thu, 30 Jan 2014 21:52:11 +0000 (21:52 +0000)]
am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
428ccea5090d3a88d6af898cd90b52df4062101f':
Revert "add google cast feature page"
Scott Main [Thu, 30 Jan 2014 21:27:25 +0000 (21:27 +0000)]
Merge "Revert "add Cast to the sidenav"" into klp-docs
Scott Main [Thu, 30 Jan 2014 21:27:06 +0000 (21:27 +0000)]
Revert "add Cast to the sidenav"
This reverts commit
3781318fefba28699e7713b231c9591bf29eadac.
Change-Id: Iacefcd9a9d1f678d7a16f2bcdaac4c6cc90a475d
Scott Main [Thu, 30 Jan 2014 21:24:45 +0000 (21:24 +0000)]
Merge "Revert "add google cast feature page"" into klp-docs
Scott Main [Thu, 30 Jan 2014 21:24:25 +0000 (21:24 +0000)]
Revert "add google cast feature page"
This reverts commit
cf010ab9c5df8896c57a722137ac3b4306ef1ca5.
Change-Id: I87197ce3c4f65ae8899bbf081cb4c0e84e4f1684
Quddus Chong [Thu, 30 Jan 2014 19:36:07 +0000 (19:36 +0000)]
am
f29e2589: am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
f29e2589a440e73d9dea1a6c9c7aed1c5a3002f2':
Revert "docs: Added API reference docs for GCore Iberico release."
Quddus Chong [Thu, 30 Jan 2014 19:33:24 +0000 (19:33 +0000)]
am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
583e0b2c0e1011406342a0801045a893b75880ca':
Revert "docs: Added API reference docs for GCore Iberico release."
Quddus Chong [Thu, 30 Jan 2014 19:31:05 +0000 (19:31 +0000)]
Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
Quddus Chong [Thu, 30 Jan 2014 19:03:16 +0000 (19:03 +0000)]
Revert "docs: Added API reference docs for GCore Iberico release."
This reverts commit
32993c68fff5cb229c8503ffe0fad06b53189377.
Change-Id: I8eab48ae260a3289ae0d4c0a131d80a1fd1a5316
Scott Main [Thu, 30 Jan 2014 18:06:44 +0000 (18:06 +0000)]
am
8b6fa56f: am
c1ae12b7: update android studio download to 0.4.2
* commit '
8b6fa56f5cdb66ed1bafb7920ba8299ee8b3034a':
update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 18:03:05 +0000 (18:03 +0000)]
am
c1ae12b7: update android studio download to 0.4.2
* commit '
c1ae12b7d891ff3598d03f52a0e817876d7921e3':
update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 16:55:01 +0000 (08:55 -0800)]
update android studio download to 0.4.2
Change-Id: Icf789bb6a2cfb254b25e865e2a60ec4717887afa
Scott Main [Thu, 30 Jan 2014 16:42:44 +0000 (16:42 +0000)]
am
e49346dc: am
eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
* commit '
e49346dcb213cc96f910c798e4aa00688197af9a':
Revert "add warning to all the new iberico API pages about SDK not available yet"
Scott Main [Thu, 30 Jan 2014 16:38:46 +0000 (16:38 +0000)]
am
0d9f5b64: am
e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
* commit '
0d9f5b640c31a5bce699419a93a98acef1471db7':
Revert "add api notice to cast package index"
Scott Main [Thu, 30 Jan 2014 16:38:33 +0000 (16:38 +0000)]
am
eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
* commit '
eb35de00dec9444e0c46ac641a74d058be48d547':
Revert "add warning to all the new iberico API pages about SDK not available yet"
Scott Main [Thu, 30 Jan 2014 16:34:52 +0000 (16:34 +0000)]
am
eee01505: am
36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
* commit '
eee015057a2abfaef2ac7360a5536605e7d74e05':
Revert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:34:26 +0000 (16:34 +0000)]
Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
Scott Main [Thu, 30 Jan 2014 16:34:26 +0000 (16:34 +0000)]
am
e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
* commit '
e627eaeebe061e3fc586a78c8837d1b780d0741b':
Revert "add api notice to cast package index"
Scott Main [Thu, 30 Jan 2014 16:33:50 +0000 (16:33 +0000)]
Revert "add warning to all the new iberico API pages about SDK not available yet"
This reverts commit
e724990230d267c13f8f820b5fdbe7c58b25d344.
Change-Id: I1415bf9542b01b57b1802115466288ec93ab6987
Scott Main [Thu, 30 Jan 2014 16:31:44 +0000 (16:31 +0000)]
Merge "Revert "add api notice to cast package index"" into klp-docs
Scott Main [Thu, 30 Jan 2014 16:30:26 +0000 (16:30 +0000)]
am
36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
* commit '
36d7dfb7e816836dbc6039237cadd3382e10d5b2':
Revert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:28:27 +0000 (16:28 +0000)]
Revert "add api notice to cast package index"
This reverts commit
845bcc6d344765a0ea7cfcf0b4ac398774d06f94.
Change-Id: I07b047f1b44e8b9b32bb4b36b6f858cdef9fed9e
Scott Main [Thu, 30 Jan 2014 16:26:21 +0000 (16:26 +0000)]
Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
Scott Main [Thu, 30 Jan 2014 16:25:38 +0000 (16:25 +0000)]
Revert "add api notice to a bunch more files in iberico release"
This reverts commit
c62223a04d15da4240129a9b05ad0be965f08ee4.
Change-Id: If3cee4062e2f48a3c1e365f025701e6d1de9c9d4
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
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
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
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: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:26:19 +0000 (07:26 -0800)]
am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
d228a03891f60520d517b2a3bc900b008b2da702':
mNativeCanvas is long, not int.
Narayan Kamath [Wed, 29 Jan 2014 15:02:05 +0000 (15:02 +0000)]
Merge "mNativeCanvas is long, not int."
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: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: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"
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"
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
Scott Main [Wed, 29 Jan 2014 08:18:54 +0000 (08:18 +0000)]
am
e535499e: Merge "add api notice to cast package index" into klp-docs
* commit '
e535499ec3ca9a05dd4b3e6e0fbfdadf01b22415':
add api notice to cast package index
Scott Main [Wed, 29 Jan 2014 08:18:47 +0000 (08:18 +0000)]
am
c62223a0: add api notice to a bunch more files in iberico release
* commit '
c62223a04d15da4240129a9b05ad0be965f08ee4':
add api notice to a bunch more files in iberico release
Scott Main [Wed, 29 Jan 2014 08:15:11 +0000 (08:15 +0000)]
Merge "add api notice to cast package index" into klp-docs
Scott Main [Wed, 29 Jan 2014 07:52:23 +0000 (07:52 +0000)]
am
da59b9c1: am
e7249902: add warning to all the new iberico API pages about SDK not available yet
* commit '
da59b9c1a8b1e5866ab884fe498838b7d91b55a6':
add warning to all the new iberico API pages about SDK not available yet
quddusc [Wed, 29 Jan 2014 07:52:12 +0000 (07:52 +0000)]
am
c4cba0e9: am
32993c68: docs: Added API reference docs for GCore Iberico release.
* commit '
c4cba0e991596d524a5a85e66ea3a8dd65f5cef5':
docs: Added API reference docs for GCore Iberico release.
Scott Main [Wed, 29 Jan 2014 07:34:55 +0000 (07:34 +0000)]
am
e7249902: add warning to all the new iberico API pages about SDK not available yet
* commit '
e724990230d267c13f8f820b5fdbe7c58b25d344':
add warning to all the new iberico API pages about SDK not available yet
quddusc [Wed, 29 Jan 2014 07:34:48 +0000 (07:34 +0000)]
am
32993c68: docs: Added API reference docs for GCore Iberico release.
* commit '
32993c68fff5cb229c8503ffe0fad06b53189377':
docs: Added API reference docs for GCore Iberico release.
Scott Main [Wed, 29 Jan 2014 07:02:13 +0000 (23:02 -0800)]
add api notice to a bunch more files in iberico release
Change-Id: Ia260aa4bcb2f46cfeff1478f951c04951ad542a6
Scott Main [Wed, 29 Jan 2014 05:58:39 +0000 (21:58 -0800)]
add api notice to cast package index
Change-Id: Ie5859576540b8ff12eb97c333e053eb637f21f0d
Scott Main [Wed, 29 Jan 2014 05:20:36 +0000 (21:20 -0800)]
add warning to all the new iberico API pages about SDK not available yet
Change-Id: Idcfc470e0ae8fdd4bbaec8bedf6cfd50dbcc74b7
fisherson_lin [Mon, 20 Jan 2014 06:47:27 +0000 (14:47 +0800)]
[Navigation bar] Allow "right to left" gesture to launch search panel
Symptom: "Bottom to up" gesture can launch search panel in portrait, but "right to left" gesture CANNOT in landscape.
Root Cause: Not handled.
Solution: Set swapXY to handle this in landscape case.
Change-Id: I1793280b3656af6912e6b4583b08e80a0a38e44a
quddusc [Sat, 18 Jan 2014 23:43:37 +0000 (15:43 -0800)]
docs: Added API reference docs for GCore Iberico release.
Change-Id: Ic8816e44aa578c258fef91bf93873b698ac4090e
Scott Main [Wed, 29 Jan 2014 04:05:24 +0000 (04:05 +0000)]
am
31db1bba: am
cf010ab9: add google cast feature page
* commit '
31db1bbaa1f69600fe82b4691717772d08785364':
add google cast feature page
Scott Main [Wed, 29 Jan 2014 04:02:03 +0000 (04:02 +0000)]
am
cf010ab9: add google cast feature page
* commit '
cf010ab9c5df8896c57a722137ac3b4306ef1ca5':
add google cast feature page
Scott Main [Mon, 27 Jan 2014 21:17:45 +0000 (13:17 -0800)]
add google cast feature page
Change-Id: Ie46b8ecdccea5ab3069176d15562d69aacc2d831
Adam Koch [Wed, 29 Jan 2014 02:56:42 +0000 (13:56 +1100)]
Doc fix: Update code snippet in displaying bitmaps training class
Bug:
12715659
Change-Id: I33ad0ae04ff8855a3fc09a312830e0277dcfe70d
Scott Main [Wed, 29 Jan 2014 00:06:11 +0000 (00:06 +0000)]
am
2d27da36: am
3781318f: add Cast to the sidenav
* commit '
2d27da36489668d2fedce0bbdcfe50e96206bdd1':
add Cast to the sidenav
Scott Main [Wed, 29 Jan 2014 00:02:52 +0000 (00:02 +0000)]
am
3781318f: add Cast to the sidenav
* commit '
3781318fefba28699e7713b231c9591bf29eadac':
add Cast to the sidenav
Scott Main [Tue, 28 Jan 2014 23:54:56 +0000 (15:54 -0800)]
add Cast to the sidenav
Change-Id: I7bb04e523363ad4964eb5bef405d9e2e4456e2d0
Mark Salyzyn [Tue, 28 Jan 2014 21:38:43 +0000 (21:38 +0000)]
am
2c6b048b: am
967c5d00: Merge changes I3659193f,I8b78e4db
* commit '
2c6b048bed296949878318a7c60faf247f538e67':
jni: Resolve build warnings
jni: Incorporate liblog reading API
Mark Salyzyn [Tue, 28 Jan 2014 21:36:14 +0000 (13:36 -0800)]
am
967c5d00: Merge changes I3659193f,I8b78e4db
* commit '
967c5d00dfcd890820c3ca82bc608814ebfe1cc1':
jni: Resolve build warnings
jni: Incorporate liblog reading API
Mark Salyzyn [Tue, 28 Jan 2014 21:30:39 +0000 (21:30 +0000)]
Merge changes I3659193f,I8b78e4db
* changes:
jni: Resolve build warnings
jni: Incorporate liblog reading API
Narayan Kamath [Tue, 28 Jan 2014 19:47:58 +0000 (19:47 +0000)]
resolved conflicts for merge of
b82b2f98 to klp-dev-plus-aosp
Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b
Narayan Kamath [Tue, 28 Jan 2014 19:18:45 +0000 (19:18 +0000)]
am
23abbfbb: am
154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '
23abbfbb814501b825edc056027270f03f39506b':
AArch64: Use long for pointers in graphics/Camera
Narayan Kamath [Tue, 28 Jan 2014 19:18:40 +0000 (19:18 +0000)]
am
aa9ba887: am
6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit '
aa9ba887371e875ffbde49f43fa12bb5f123425b':
AArch64: Make graphics classes 64-bit compatible
Narayan Kamath [Tue, 28 Jan 2014 19:16:00 +0000 (11:16 -0800)]
am
9b0f4be0: Merge "Track 64bit changes to android/graphics."
* commit '
9b0f4be0a20ee48a3ddf56438e846231955bd557':
Track 64bit changes to android/graphics.
Narayan Kamath [Tue, 28 Jan 2014 19:15:57 +0000 (11:15 -0800)]
am
154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '
154614abbcc819c265bfb79b2626fcee66333ac2':
AArch64: Use long for pointers in graphics/Camera
Narayan Kamath [Tue, 28 Jan 2014 19:15:47 +0000 (11:15 -0800)]
am
6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit '
6e09eb4c6753f8e5cbd04f9b0c7b65046d27afdb':
AArch64: Make graphics classes 64-bit compatible
Narayan Kamath [Tue, 28 Jan 2014 19:12:33 +0000 (19:12 +0000)]
Merge "Track 64bit changes to android/graphics."
Narayan Kamath [Tue, 28 Jan 2014 19:12:29 +0000 (19:12 +0000)]
Merge "AArch64: Use long for pointers in graphics/Camera"
Narayan Kamath [Tue, 28 Jan 2014 19:12:16 +0000 (19:12 +0000)]
Merge "AArch64: Make graphics classes 64-bit compatible"
Craig Mautner [Tue, 28 Jan 2014 18:11:13 +0000 (18:11 +0000)]
am
245b58d6: am
baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
* commit '
245b58d6f47740c09ebd47b75e6021c7cfb691af':
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
OSDN Git Service
