Dan Albert
21e862dc38
Merge "Add missing includes."
...
am: 59779fd150
Change-Id: I9c4dd93b8e89916ef5e7a2289eb3774440d71a2d
2017-10-20 22:00:22 +00:00
Treehugger Robot
59779fd150
Merge "Add missing includes."
2017-10-20 21:54:33 +00:00
Dan Albert
436ab10d3c
Add missing includes.
...
Change-Id: I8bc852db7396baa5367a4fc5d013dd9852353a4f
Exempt-From-Owner-Approval: trivial cleanup
Test: mma
Bug: None
2017-10-20 11:38:51 -07:00
android-build-team Robot
1878ddc88c
Snap for 4402171 from 4a08661b58
to pi-release
...
Change-Id: I6149425dcd36f5ecb9a8cae590e64fb976359cf5
2017-10-18 08:01:04 +00:00
Steve Pfetsch
4a08661b58
Merge "resolve merge conflicts of 5abba5cb
to oc-dr1-dev am: 812125f118
am: ba013afe36" into oc-mr1-dev-plus-aosp
...
am: e458e16deb
Change-Id: Id34b4426a640e2e39dbae697b8b6e99ee8f502f2
2017-10-17 21:11:51 +00:00
Steve Pfetsch
03ddce3701
resolve merge conflicts of 5abba5cb
to oc-dr1-dev am: 812125f118
am: 0e89ea8021
...
am: 86da9224b4
Change-Id: I97a47c37ef0145fac5992193a23a87b604b47735
2017-10-17 21:11:30 +00:00
Naseer Ahmed
fb383b1e3d
libqdutils: Fix invalid handle access am: 7f458d41ff
...
am: 040edacf20
Change-Id: I2d21675323d9035dadf25e8427acd20ec2d78d22
2017-10-17 21:11:13 +00:00
Android Build Merger (Role)
e458e16deb
Merge "resolve merge conflicts of 5abba5cb
to oc-dr1-dev am: 812125f118
am: ba013afe36" into oc-mr1-dev-plus-aosp
2017-10-17 20:36:49 +00:00
Steve Pfetsch
02f27cf087
resolve merge conflicts of 5abba5cb
to oc-dr1-dev am: 812125f118
...
am: ba013afe36
Change-Id: Ia35f3c82318e4a550fb78025a6db3f1fe96606f3
2017-10-17 20:36:35 +00:00
Steve Pfetsch
86da9224b4
resolve merge conflicts of 5abba5cb
to oc-dr1-dev am: 812125f118
...
am: 0e89ea8021
Change-Id: I672741415f643e3a299abbddaab1ec0a12dc4c1d
2017-10-17 20:36:33 +00:00
Steve Pfetsch
ba013afe36
resolve merge conflicts of 5abba5cb
to oc-dr1-dev
...
am: 812125f118
Change-Id: Ibedbf64fceaa8b483333e0fc702d54972e2034f8
2017-10-17 20:34:00 +00:00
Steve Pfetsch
0e89ea8021
resolve merge conflicts of 5abba5cb
to oc-dr1-dev
...
am: 812125f118
Change-Id: Id44d8d0f0594bf53bc2a46b73830b74d61b54332
2017-10-17 20:34:00 +00:00
Naseer Ahmed
040edacf20
libqdutils: Fix invalid handle access
...
am: 7f458d41ff
Change-Id: Ic17a7586e6790640b7aaee20c5cbd84db10622e6
2017-10-17 20:29:30 +00:00
Steve Pfetsch
812125f118
resolve merge conflicts of 5abba5cb
to oc-dr1-dev
...
Bug: 63662821
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8f4539b80c542b1212a090a45fbb7b2dfd5ce274
2017-10-17 18:03:14 +00:00
Naseer Ahmed
7f458d41ff
libqdutils: Fix invalid handle access
...
Bug: 67016926
Change-Id: Ib632bbd6901da3bf24b5bbbe1eebbffde47a4220
2017-10-17 10:15:27 -07:00
Dan Albert
4ae79c3f4b
Add missing includes. am: 726ab4f0c1
am: 4d23cad8bb
...
am: 4a3f1227a9
Change-Id: I1d5275b8d3265572bb9465bcf31574dbb1dc470a
2017-10-17 08:59:15 +00:00
Steve Pfetsch
b12b114d12
[DO NOT MERGE] msm8998: libgralloc: Fix adding offset to the mapped base address am: c03ecc2907
-s ours am: d74ebf2dcc
am: 7a80115acf
am: 2f680dcf13
...
am: 7cd5999282
-s ours
Change-Id: I26e78389cba04007f569e28939ab8515a9dd5024
2017-10-17 08:58:39 +00:00
Ramkumar Radhakrishnan
74ec158379
[DO NOT MERGE] msm8996: libgralloc: Fix adding offset to the mapped base address am: b7f8cc171e
-s ours am: 0b14ef5714
am: f2c4d04a8e
am: 5f42132258
...
am: b9b56ca985
-s ours
Change-Id: Ic44a9c9dd7fef05690773c23a9bdc69c00c5825f
2017-10-17 08:58:33 +00:00
Steve Pfetsch
36995ebeef
[DO NOT MERGE] msm8994: libgralloc: Fix adding offset to the mapped base address am: e6ce8dd698
-s ours am: cbde7042ad
am: c2065704a6
am: b3af604886
...
am: 8f88a61d1f
-s ours
Change-Id: I65b1db27d2554557a059fd78494b4c0fd7dd2613
2017-10-17 08:58:25 +00:00
Steve Pfetsch
28938a4e27
[DO NOT MERGE] msm8998: libgralloc: Fix adding offset to the mapped base address am: c03ecc2907
-s ours am: d74ebf2dcc
am: 7a80115acf
am: 2b262f4373
...
am: c82e49b96d
-s ours
Change-Id: I492dd3fbc9efc7592d6918f593ffdeb653d180f7
2017-10-17 08:57:50 +00:00
Ramkumar Radhakrishnan
66d8bf92b8
[DO NOT MERGE] msm8996: libgralloc: Fix adding offset to the mapped base address am: b7f8cc171e
-s ours am: 0b14ef5714
am: f2c4d04a8e
am: d54fd2ca4e
...
am: 87f5314e89
-s ours
Change-Id: Ia19f635073cf8642cc0951328bbb4b36f43c0790
2017-10-17 08:57:47 +00:00
Steve Pfetsch
ba58eb7f7c
[DO NOT MERGE] msm8994: libgralloc: Fix adding offset to the mapped base address am: e6ce8dd698
-s ours am: cbde7042ad
am: c2065704a6
am: 54275be412
...
am: 5fce88f032
-s ours
Change-Id: I5cca9a0c3094b5d1a10245df5ba07411400406d3
2017-10-17 08:57:42 +00:00
Dan Albert
4a3f1227a9
Add missing includes. am: 726ab4f0c1
...
am: 4d23cad8bb
Change-Id: Ic2f35fe6eef6e731988f9a6449966af11f1a4761
2017-10-17 08:44:12 +00:00
Dan Albert
4d23cad8bb
Add missing includes.
...
am: 726ab4f0c1
Change-Id: I42eda8a68645710968fc6da30799428b5387f290
2017-10-17 08:42:42 +00:00
android-build-team Robot
06560d744c
Snap for 4399706 from 9dd630cd3b
to pi-release
...
Change-Id: I9c2fe2a6d7ceecc1abc11df1ae1f11bcb360edc7
2017-10-17 08:15:46 +00:00
Dan Albert
726ab4f0c1
Add missing includes.
...
Test: mma
Bug: None
Change-Id: I945e22b606e0ed3b944ac2bc352b13ed9a73ed7d
(cherry picked from commit 6a8d7abeb4
)
2017-10-17 07:58:14 +00:00
Alain Vongsouvanh
4a1efd0680
display: msm8909w caf release LW.BR.3.0.1-04400-8x09w.0 for SD3100.
...
MSM8909W display HAL code copied from CAF release LW.BR.3.0.1-04400-8x09w.0.
Created a new msm8909w_3100 subfolder as 3.0.1 releases are not compatible with
3.0.0.
Change-Id: I4eb9a1f5063ace1f27f35eb7e814bf82498493d3
(cherry picked from commit 5f5637ca395ebc17367279346bbd0b93f83ce6fb)
2017-10-17 06:34:57 +00:00
Steve Pfetsch
7cd5999282
[DO NOT MERGE] msm8998: libgralloc: Fix adding offset to the mapped base address am: c03ecc2907
-s ours am: d74ebf2dcc
am: 7a80115acf
...
am: 2f680dcf13
Change-Id: Ib4e058025d47916692571bb09eb3679de68ac9e1
2017-10-17 05:34:00 +00:00
Ramkumar Radhakrishnan
b9b56ca985
[DO NOT MERGE] msm8996: libgralloc: Fix adding offset to the mapped base address am: b7f8cc171e
-s ours am: 0b14ef5714
am: f2c4d04a8e
...
am: 5f42132258
Change-Id: I0008b43908b6f25bb06fc5b15aab6ea61a81c259
2017-10-17 05:33:53 +00:00
Steve Pfetsch
8f88a61d1f
[DO NOT MERGE] msm8994: libgralloc: Fix adding offset to the mapped base address am: e6ce8dd698
-s ours am: cbde7042ad
am: c2065704a6
...
am: b3af604886
Change-Id: I5c817bc983d441b528a472b0b75cd45563a94f68
2017-10-17 05:33:46 +00:00
Steve Pfetsch
c82e49b96d
[DO NOT MERGE] msm8998: libgralloc: Fix adding offset to the mapped base address am: c03ecc2907
-s ours am: d74ebf2dcc
am: 7a80115acf
...
am: 2b262f4373
Change-Id: Id1a2454efb083d6d2334c1df3298e3be4ca39735
2017-10-17 03:32:17 +00:00
Ramkumar Radhakrishnan
87f5314e89
[DO NOT MERGE] msm8996: libgralloc: Fix adding offset to the mapped base address am: b7f8cc171e
-s ours am: 0b14ef5714
am: f2c4d04a8e
...
am: d54fd2ca4e
Change-Id: I5fa6372340b5059a5c53e703a7bfcd675584cbd2
2017-10-17 03:32:12 +00:00
Steve Pfetsch
5fce88f032
[DO NOT MERGE] msm8994: libgralloc: Fix adding offset to the mapped base address am: e6ce8dd698
-s ours am: cbde7042ad
am: c2065704a6
...
am: 54275be412
Change-Id: I75bc0ae266579b28fff9754b17fad1575a224d8a
2017-10-17 03:32:06 +00:00
Steve Pfetsch
2b262f4373
[DO NOT MERGE] msm8998: libgralloc: Fix adding offset to the mapped base address am: c03ecc2907
-s ours am: d74ebf2dcc
...
am: 7a80115acf
Change-Id: Ifb4b5e4c6550a2387e1e1131e1d43f3877f6c685
2017-10-17 02:18:22 +00:00
Ramkumar Radhakrishnan
d54fd2ca4e
[DO NOT MERGE] msm8996: libgralloc: Fix adding offset to the mapped base address am: b7f8cc171e
-s ours am: 0b14ef5714
...
am: f2c4d04a8e
Change-Id: I83540f36eb1ed375503baaae60618f3892684d71
2017-10-17 02:18:16 +00:00
Steve Pfetsch
54275be412
[DO NOT MERGE] msm8994: libgralloc: Fix adding offset to the mapped base address am: e6ce8dd698
-s ours am: cbde7042ad
...
am: c2065704a6
Change-Id: I0d57348ef42ec31e4da8a36b9b9aa8ec74c6d9ab
2017-10-17 02:18:11 +00:00
Steve Pfetsch
2f680dcf13
[DO NOT MERGE] msm8998: libgralloc: Fix adding offset to the mapped base address am: c03ecc2907
-s ours am: d74ebf2dcc
...
am: 7a80115acf
Change-Id: Ie6e7c000c10cc26462831e7a2859b27a6624b2f3
2017-10-17 02:07:36 +00:00
Ramkumar Radhakrishnan
5f42132258
[DO NOT MERGE] msm8996: libgralloc: Fix adding offset to the mapped base address am: b7f8cc171e
-s ours am: 0b14ef5714
...
am: f2c4d04a8e
Change-Id: I3896b091dcda52a40c5ce65d51c5d7453a4e4b89
2017-10-17 02:07:33 +00:00
Steve Pfetsch
b3af604886
[DO NOT MERGE] msm8994: libgralloc: Fix adding offset to the mapped base address am: e6ce8dd698
-s ours am: cbde7042ad
...
am: c2065704a6
Change-Id: I3188386b9548ea32f9e0e225fbca9ce69c5819d2
2017-10-17 02:07:30 +00:00
TreeHugger Robot
5abba5cb83
Merge changes I3621eb30,Ib67ba670,I722ed256 into oc-dev
...
* changes:
[DO NOT MERGE] msm8998: libgralloc: Fix adding offset to the mapped base address
[DO NOT MERGE] msm8996: libgralloc: Fix adding offset to the mapped base address
[DO NOT MERGE] msm8994: libgralloc: Fix adding offset to the mapped base address
2017-10-17 01:54:22 +00:00
Steve Pfetsch
7a80115acf
[DO NOT MERGE] msm8998: libgralloc: Fix adding offset to the mapped base address am: c03ecc2907
-s ours
...
am: d74ebf2dcc
Change-Id: Id58f644566b070a415bc8eb800c32ff347f4f14a
2017-10-17 01:49:20 +00:00
Ramkumar Radhakrishnan
f2c4d04a8e
[DO NOT MERGE] msm8996: libgralloc: Fix adding offset to the mapped base address am: b7f8cc171e
-s ours
...
am: 0b14ef5714
Change-Id: Icdcdc452c381c192f574e37878f81914c82269f3
2017-10-17 01:49:18 +00:00
Steve Pfetsch
c2065704a6
[DO NOT MERGE] msm8994: libgralloc: Fix adding offset to the mapped base address am: e6ce8dd698
-s ours
...
am: cbde7042ad
Change-Id: If9d50411c48f6463b6040396abc2a86c9edfeb4c
2017-10-17 01:49:15 +00:00
TreeHugger Robot
9dd630cd3b
Merge changes Ib67ba670,I722ed256
...
* changes:
msm8996: libgralloc: Fix adding offset to the mapped base address
msm8994: libgralloc: Fix adding offset to the mapped base address
2017-10-17 01:39:53 +00:00
Steve Pfetsch
d74ebf2dcc
[DO NOT MERGE] msm8998: libgralloc: Fix adding offset to the mapped base address
...
am: c03ecc2907
-s ours
Change-Id: Ie68bb45646fae9889b4d7ddf47214402d0ccd192
2017-10-17 01:33:16 +00:00
Ramkumar Radhakrishnan
0b14ef5714
[DO NOT MERGE] msm8996: libgralloc: Fix adding offset to the mapped base address
...
am: b7f8cc171e
-s ours
Change-Id: I3deb49f65b91c307477ccc538a488b595fe4cd0c
2017-10-17 01:33:15 +00:00
Steve Pfetsch
cbde7042ad
[DO NOT MERGE] msm8994: libgralloc: Fix adding offset to the mapped base address
...
am: e6ce8dd698
-s ours
Change-Id: Icdababbb7ba9193a1fb34215dc2945afffec95d6
2017-10-17 01:33:14 +00:00
Dan Albert
6a8d7abeb4
Add missing includes.
...
Test: mma
Bug: None
Change-Id: I945e22b606e0ed3b944ac2bc352b13ed9a73ed7d
2017-10-16 13:33:10 -07:00
android-build-team Robot
76dd22a44b
Snap for 4393550 from e234d57654
to pi-release
...
Change-Id: I00fc61f883a1375c0406d8e372102909e2514365
2017-10-13 08:13:47 +00:00
Ramkumar Radhakrishnan
090014d3fb
msm8996: libgralloc: Fix adding offset to the mapped base address
...
Bug: 63662821
CRs-Fixed: 2109325
Change-Id: Ib67ba670753d0f2ce41ca7168de7ab5202103a47
2017-10-11 18:09:42 -07:00