Qiwen Zhao [Tue, 10 Dec 2013 18:47:17 +0000 (18:47 +0000)]
am
79e6e466: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit '
79e6e4661c327607f81908906509bfb8b948398f':
Christopher Ferris [Mon, 9 Dec 2013 23:51:51 +0000 (23:51 +0000)]
Merge "Move videodev2.h to include/linux."
Qiwen Zhao [Mon, 9 Dec 2013 22:19:36 +0000 (14:19 -0800)]
DO NOT MERGE reset to goog/klp-volantis-dev
The Android Open Source Project [Fri, 6 Dec 2013 22:19:19 +0000 (22:19 +0000)]
The Android Open Source Project [Fri, 6 Dec 2013 22:19:18 +0000 (22:19 +0000)]
Nick Kralevich [Fri, 6 Dec 2013 22:19:18 +0000 (22:19 +0000)]
am
03d1873b: am
de9b6a49: am
070e4486: Merge "mobicore: do not use GNU old-style field designators"
* commit '
03d1873bd2c0fe904a81b0ec213bb37917d9516a':
Ed Heyl [Fri, 6 Dec 2013 22:19:17 +0000 (22:19 +0000)]
Alex Ray [Fri, 6 Dec 2013 22:19:17 +0000 (22:19 +0000)]
am
61a44ef2: am
ad73045f: am
a3bcc37b: libcamera2: Video Stabilization Killswitch
* commit '
61a44ef24f5f0a1b102a613931d10125f04eeb91':
Ed Heyl [Fri, 6 Dec 2013 22:19:16 +0000 (22:19 +0000)]
Alex Ray [Fri, 6 Dec 2013 22:19:16 +0000 (22:19 +0000)]
am
ba949fe2: am
9dc5f4f7: am
87710506: Merge "libcamera2: Static characteristic metadata fixes" into klp-dev
* commit '
ba949fe2d7f7a216c7992be462136ba9f0da145e':
Alex Ray [Fri, 6 Dec 2013 22:19:15 +0000 (22:19 +0000)]
am
f3dcf4a2: am
e6a4b5d8: am
a6302fad: libcamera2: new return code when camera in use
* commit '
f3dcf4a26a8f4d95377015db72aea2ea98edb5b9':
Alex Ray [Fri, 6 Dec 2013 22:19:15 +0000 (22:19 +0000)]
am
acb664cb: am
646e2287: am
30f3ec95: libcamera2: Add exposure time to default request
* commit '
acb664cbec254b0e205bcb6dd9abc4842f76d765':
Greg Hackmann [Fri, 6 Dec 2013 22:19:14 +0000 (22:19 +0000)]
am
b531855a: am
a9911a58: am
c0b4a4f1: hwc: do not allow gsc downscaling by exactly max_downscale
* commit '
b531855a2966a5d7f0d23ca1259d1c1328ee3a44':
Jesse Hall [Fri, 6 Dec 2013 22:19:14 +0000 (22:19 +0000)]
am
d0cb3ab7: am
0c218aca: am
d03ee772: Merge "Restore overlay support for RGB565 layers" into klp-dev
* commit '
d0cb3ab7560a3871fb132ba359dcb4613a9c2455':
Zhijun He [Fri, 6 Dec 2013 22:19:13 +0000 (22:19 +0000)]
am
ac21dce2: am
2fc43c35: am
ff33d0b2: Merge "libcamera2: fix test crash issue due to garbage function pointer." into klp-dev
* commit '
ac21dce2b0be89048630dac6289aca64e8b63f9e':
Zhijun He [Fri, 6 Dec 2013 22:19:13 +0000 (22:19 +0000)]
am
aaf4fcb0: am
db543703: am
a4863a2a: libcamera2: hardwareSupportedLevel should be limited
* commit '
aaf4fcb087a8a6e065e9f7970e01c429053dec3a':
SeungBeom Kim [Fri, 6 Dec 2013 22:19:12 +0000 (22:19 +0000)]
am
c6f943f8: am
e7b90726: am
24b40bec: exynos_omx: multi_thread: Fix CodecReconfig issue.
* commit '
c6f943f8c58300ff04ffbebc72031fa10ed51422':
SeungBeom Kim [Fri, 6 Dec 2013 22:19:11 +0000 (22:19 +0000)]
am
5f6cd76f: am
abe4b6d8: am
bd09b814: exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.
* commit '
5f6cd76fab310d65ae1ff1b58f991d154c90081e':
Kenny Root [Fri, 6 Dec 2013 22:19:10 +0000 (22:19 +0000)]
am
82fcc962: am
4a13c150: am
30a4fead: Merge "Use canonical UniquePtr.h header"
* commit '
82fcc96245cf003429377508a46734c416ab8619':
The Android Open Source Project [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
The Android Open Source Project [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
Nick Kralevich [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am
de9b6a49: am
070e4486: Merge "mobicore: do not use GNU old-style field designators"
* commit '
de9b6a49620d14c09bc95a1b80e9c5496cf4029b':
mobicore: do not use GNU old-style field designators
Ed Heyl [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
Alex Ray [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am
ad73045f: am
a3bcc37b: libcamera2: Video Stabilization Killswitch
* commit '
ad73045fa524976ad55b95edc89b46c37ef08273':
Ed Heyl [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
Alex Ray [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am
9dc5f4f7: am
87710506: Merge "libcamera2: Static characteristic metadata fixes" into klp-dev
* commit '
9dc5f4f7212c37eac1801eb0d3d14f6524e22708':
Alex Ray [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am
e6a4b5d8: am
a6302fad: libcamera2: new return code when camera in use
* commit '
e6a4b5d8a9ab44f52c73fd032445eb7fcffe1416':
Alex Ray [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am
646e2287: am
30f3ec95: libcamera2: Add exposure time to default request
* commit '
646e2287cdcec6596e723c999d324a3dad642a9f':
Greg Hackmann [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am
a9911a58: am
c0b4a4f1: hwc: do not allow gsc downscaling by exactly max_downscale
* commit '
a9911a58520a0defc2e1628c6932cd67e6260736':
Jesse Hall [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am
0c218aca: am
d03ee772: Merge "Restore overlay support for RGB565 layers" into klp-dev
* commit '
0c218acabced1726f66b3a19f88e20460cc96547':
Zhijun He [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am
2fc43c35: am
ff33d0b2: Merge "libcamera2: fix test crash issue due to garbage function pointer." into klp-dev
* commit '
2fc43c35b61cc3a88cd883aab0f8fbff0442472d':
Zhijun He [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am
db543703: am
a4863a2a: libcamera2: hardwareSupportedLevel should be limited
* commit '
db54370366ac839386858e0c94079cab2e5d6157':
SeungBeom Kim [Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)]
am
e7b90726: am
24b40bec: exynos_omx: multi_thread: Fix CodecReconfig issue.
* commit '
e7b9072624866e733020dfdff8c77f201c3a24dd':
SeungBeom Kim [Fri, 6 Dec 2013 21:04:23 +0000 (21:04 +0000)]
am
abe4b6d8: am
bd09b814: exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.
* commit '
abe4b6d876ec331003a6759e287f803bd0a72c13':
Kenny Root [Fri, 6 Dec 2013 21:04:23 +0000 (21:04 +0000)]
am
4a13c150: am
30a4fead: Merge "Use canonical UniquePtr.h header"
* commit '
4a13c150ffe58c53148bab8db32e647ef4e535e7':
Use canonical UniquePtr.h header
The Android Open Source Project [Fri, 6 Dec 2013 01:38:45 +0000 (01:38 +0000)]
The Android Open Source Project [Fri, 6 Dec 2013 01:25:48 +0000 (17:25 -0800)]
The Android Open Source Project [Thu, 5 Dec 2013 20:38:21 +0000 (12:38 -0800)]
Christopher Ferris [Wed, 4 Dec 2013 22:53:23 +0000 (14:53 -0800)]
Move videodev2.h to include/linux.
Modify all places that include the local header file videodev2.h to
change to include linux/videodev2.h. This is a special version of a kernel
header file that needs to override the one found in the bionic kernel
headers.
Change-Id: Ia9aeaf88b477b252e5bbb8fb9655a68b6042e183
The Android Open Source Project [Sat, 23 Nov 2013 03:31:24 +0000 (19:31 -0800)]
The Android Open Source Project [Sat, 23 Nov 2013 01:40:44 +0000 (17:40 -0800)]
The Android Open Source Project [Fri, 22 Nov 2013 18:35:28 +0000 (10:35 -0800)]
Nick Kralevich [Wed, 13 Nov 2013 01:08:28 +0000 (17:08 -0800)]
am
de9b6a49: am
070e4486: Merge "mobicore: do not use GNU old-style field designators"
* commit '
de9b6a49620d14c09bc95a1b80e9c5496cf4029b':
mobicore: do not use GNU old-style field designators
Nick Kralevich [Tue, 12 Nov 2013 23:22:32 +0000 (15:22 -0800)]
am
070e4486: Merge "mobicore: do not use GNU old-style field designators"
* commit '
070e4486c463244679631eb3f3692619f2f80f11':
mobicore: do not use GNU old-style field designators
Nick Kralevich [Tue, 12 Nov 2013 23:14:12 +0000 (23:14 +0000)]
Merge "mobicore: do not use GNU old-style field designators"
synergy dev [Tue, 12 Nov 2013 01:54:09 +0000 (17:54 -0800)]
mobicore: do not use GNU old-style field designators
Avoiding the use of gnu extensions improves code portability
Change-Id: I0523b67dc649633f5e019d3e9b8af974251b9974
Rom Lemarchand [Thu, 24 Oct 2013 18:22:55 +0000 (11:22 -0700)]
exynos: gralloc: replace struct ion_handle with ion_user_handle_t
Replace struct ion_handle with ion_user_handle_t to match new kernel headers
Change-Id: Iefff2036f01dccbd47f0f0e6eef09e804e1e2ea0
Ed Heyl [Thu, 17 Oct 2013 01:01:56 +0000 (18:01 -0700)]
Ed Heyl [Thu, 17 Oct 2013 00:56:27 +0000 (17:56 -0700)]
Ed Heyl [Thu, 17 Oct 2013 00:44:24 +0000 (17:44 -0700)]
merge in klp-release (no-op)
Alex Ray [Wed, 16 Oct 2013 00:29:27 +0000 (17:29 -0700)]
am
ad73045f: am
a3bcc37b: libcamera2: Video Stabilization Killswitch
* commit '
ad73045fa524976ad55b95edc89b46c37ef08273':
libcamera2: Video Stabilization Killswitch
Alex Ray [Tue, 15 Oct 2013 23:16:47 +0000 (16:16 -0700)]
am
a3bcc37b: libcamera2: Video Stabilization Killswitch
* commit '
a3bcc37bef2d394aaf9651686b72a7d0a74da7b0':
libcamera2: Video Stabilization Killswitch
The Android Automerger [Tue, 15 Oct 2013 22:55:44 +0000 (15:55 -0700)]
merge in klp-release history after reset to klp-dev
Alex Ray [Tue, 15 Oct 2013 06:27:33 +0000 (23:27 -0700)]
libcamera2: Video Stabilization Killswitch
Bug:
10819643
Change-Id: I6fc3478308aaaca3ebecbd7f1fe71404554917d1
Ed Heyl [Wed, 9 Oct 2013 16:12:44 +0000 (09:12 -0700)]
am
049dc0cc: am
4ed83a2b: merge in KQS81M
* commit '
049dc0cc7f54707f8759ba07cae4f18d902686b4':
*HACK* assume android requests 1 more buffer then we specify
Ed Heyl [Tue, 8 Oct 2013 22:57:55 +0000 (15:57 -0700)]
am
4ed83a2b: merge in KQS81M
* commit '
4ed83a2b6839be1c7b45db8ed8d54250f00fb65d':
*HACK* assume android requests 1 more buffer then we specify
Ed Heyl [Tue, 8 Oct 2013 22:41:54 +0000 (15:41 -0700)]
merge in KQS81M
The Android Automerger [Sun, 6 Oct 2013 13:01:37 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Alex Ray [Fri, 4 Oct 2013 18:09:39 +0000 (11:09 -0700)]
am
9dc5f4f7: am
87710506: Merge "libcamera2: Static characteristic metadata fixes" into klp-dev
* commit '
9dc5f4f7212c37eac1801eb0d3d14f6524e22708':
libcamera2: Static characteristic metadata fixes
Alex Ray [Thu, 3 Oct 2013 23:02:10 +0000 (16:02 -0700)]
am
87710506: Merge "libcamera2: Static characteristic metadata fixes" into klp-dev
* commit '
877105063c2a4f9050ea899fcff3843f39050ec6':
libcamera2: Static characteristic metadata fixes
Alex Ray [Thu, 3 Oct 2013 22:56:27 +0000 (22:56 +0000)]
Merge "libcamera2: Static characteristic metadata fixes" into klp-dev
Alex Ray [Wed, 2 Oct 2013 16:57:04 +0000 (09:57 -0700)]
am
e6a4b5d8: am
a6302fad: libcamera2: new return code when camera in use
* commit '
e6a4b5d8a9ab44f52c73fd032445eb7fcffe1416':
libcamera2: new return code when camera in use
Alex Ray [Wed, 2 Oct 2013 16:57:04 +0000 (09:57 -0700)]
am
646e2287: am
30f3ec95: libcamera2: Add exposure time to default request
* commit '
646e2287cdcec6596e723c999d324a3dad642a9f':
libcamera2: Add exposure time to default request
Alex Ray [Wed, 2 Oct 2013 16:36:40 +0000 (09:36 -0700)]
am
a6302fad: libcamera2: new return code when camera in use
* commit '
a6302fad7a2d78736ae39a341b6f3468b9c6f5a3':
libcamera2: new return code when camera in use
Alex Ray [Wed, 2 Oct 2013 16:36:39 +0000 (09:36 -0700)]
am
30f3ec95: libcamera2: Add exposure time to default request
* commit '
30f3ec95f62e0a6998d87f909844eb332c7b66e7':
libcamera2: Add exposure time to default request
The Android Automerger [Wed, 2 Oct 2013 13:01:23 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Greg Hackmann [Wed, 2 Oct 2013 03:59:06 +0000 (20:59 -0700)]
am
a9911a58: am
c0b4a4f1: hwc: do not allow gsc downscaling by exactly max_downscale
* commit '
a9911a58520a0defc2e1628c6932cd67e6260736':
Alex Ray [Mon, 30 Sep 2013 17:26:24 +0000 (10:26 -0700)]
libcamera2: new return code when camera in use
Bug:
10838065
Change-Id: I7f3e447a2082b8102968137ed0eee59de5d0de55
Alex Ray [Mon, 30 Sep 2013 17:19:21 +0000 (10:19 -0700)]
libcamera2: Add exposure time to default request
Bug:
10837491
Change-Id: I0ec0850cabb4aef76ed97a14838594ed3f549266
Greg Hackmann [Tue, 1 Oct 2013 00:08:24 +0000 (17:08 -0700)]
am
c0b4a4f1: hwc: do not allow gsc downscaling by exactly max_downscale
* commit '
c0b4a4f1a8b088964ded32dfee294b9199c71534':
hwc: do not allow gsc downscaling by exactly max_downscale
Greg Hackmann [Mon, 30 Sep 2013 21:14:45 +0000 (14:14 -0700)]
am
c0b4a4f1: hwc: do not allow gsc downscaling by exactly max_downscale
* commit '
c0b4a4f1a8b088964ded32dfee294b9199c71534':
hwc: do not allow gsc downscaling by exactly max_downscale
The Android Automerger [Sun, 29 Sep 2013 13:01:25 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Greg Hackmann [Fri, 27 Sep 2013 17:23:41 +0000 (10:23 -0700)]
hwc: do not allow gsc downscaling by exactly max_downscale
The Gscaler registers do not have enough bits to represent downscaling
by exactly 16x
Bug:
10946861
Change-Id: I6a9921193d9188bca2344815c29863c550c5e3dd
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Alex Ray [Thu, 26 Sep 2013 21:06:42 +0000 (14:06 -0700)]
libcamera2: Static characteristic metadata fixes
Bug:
10838063
Change-Id: I28b841bda396312c0a2999cd5844640527a9fc77
Jesse Hall [Tue, 24 Sep 2013 17:23:36 +0000 (10:23 -0700)]
am
0c218aca: am
d03ee772: Merge "Restore overlay support for RGB565 layers" into klp-dev
* commit '
0c218acabced1726f66b3a19f88e20460cc96547':
Restore overlay support for RGB565 layers
Zhijun He [Tue, 24 Sep 2013 17:23:36 +0000 (10:23 -0700)]
am
2fc43c35: am
ff33d0b2: Merge "libcamera2: fix test crash issue due to garbage function pointer." into klp-dev
* commit '
2fc43c35b61cc3a88cd883aab0f8fbff0442472d':
libcamera2: fix test crash issue due to garbage function pointer.
Zhijun He [Tue, 24 Sep 2013 17:23:35 +0000 (10:23 -0700)]
am
db543703: am
a4863a2a: libcamera2: hardwareSupportedLevel should be limited
* commit '
db54370366ac839386858e0c94079cab2e5d6157':
libcamera2: hardwareSupportedLevel should be limited
The Android Automerger [Tue, 24 Sep 2013 13:01:22 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Jesse Hall [Tue, 24 Sep 2013 02:00:39 +0000 (19:00 -0700)]
am
d03ee772: Merge "Restore overlay support for RGB565 layers" into klp-dev
* commit '
d03ee77200600d35e18055b8cea259c613ffcfa1':
Restore overlay support for RGB565 layers
Zhijun He [Tue, 24 Sep 2013 02:00:01 +0000 (19:00 -0700)]
am
ff33d0b2: Merge "libcamera2: fix test crash issue due to garbage function pointer." into klp-dev
* commit '
ff33d0b29cb23eeabc3629f24584dc8dc5f2267a':
libcamera2: fix test crash issue due to garbage function pointer.
Zhijun He [Tue, 24 Sep 2013 01:59:52 +0000 (18:59 -0700)]
am
a4863a2a: libcamera2: hardwareSupportedLevel should be limited
* commit '
a4863a2a81c6c3bbb3600e41c9847a10f4e6e96d':
libcamera2: hardwareSupportedLevel should be limited
Jesse Hall [Mon, 23 Sep 2013 23:38:17 +0000 (23:38 +0000)]
Merge "Restore overlay support for RGB565 layers" into klp-dev
Jesse Hall [Mon, 23 Sep 2013 23:07:31 +0000 (16:07 -0700)]
Restore overlay support for RGB565 layers
This was accidentally removed by change-id
I2b0eb35344631d162b30dd22ee0ad7651f22e6fa
which removed HAL formats 5551 and 4444.
Bug:
10748683
Change-Id: Id610083732f0495a7c4a29660c7c2c8750929510
Zhijun He [Mon, 23 Sep 2013 21:30:00 +0000 (21:30 +0000)]
Merge "libcamera2: fix test crash issue due to garbage function pointer." into klp-dev
Zhijun He [Thu, 19 Sep 2013 22:11:00 +0000 (15:11 -0700)]
libcamera2: fix test crash issue due to garbage function pointer.
Bug:
10838065
Change-Id: I89e2044f57e8588d6e7024e22a633ebe37d5a37f
Zhijun He [Mon, 23 Sep 2013 17:03:03 +0000 (10:03 -0700)]
libcamera2: hardwareSupportedLevel should be limited
Bug:
10388724
Change-Id: I564e8c5860aa322d3f5261e027f8ffcf3a02974a
The Android Automerger [Thu, 19 Sep 2013 13:01:58 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
SeungBeom Kim [Thu, 19 Sep 2013 00:09:46 +0000 (17:09 -0700)]
am
e7b90726: am
24b40bec: exynos_omx: multi_thread: Fix CodecReconfig issue.
* commit '
e7b9072624866e733020dfdff8c77f201c3a24dd':
exynos_omx: multi_thread: Fix CodecReconfig issue.
SeungBeom Kim [Thu, 19 Sep 2013 00:09:46 +0000 (17:09 -0700)]
am
abe4b6d8: am
bd09b814: exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.
* commit '
abe4b6d876ec331003a6759e287f803bd0a72c13':
exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.
SeungBeom Kim [Thu, 19 Sep 2013 00:06:25 +0000 (17:06 -0700)]
am
24b40bec: exynos_omx: multi_thread: Fix CodecReconfig issue.
* commit '
24b40bec52d792aa9907d5b76fbb66ebc15a56ed':
exynos_omx: multi_thread: Fix CodecReconfig issue.
SeungBeom Kim [Thu, 19 Sep 2013 00:06:25 +0000 (17:06 -0700)]
am
bd09b814: exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.
* commit '
bd09b8148180c902648b5ac57d024f457f852efa':
exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.
Kenny Root [Wed, 18 Sep 2013 19:08:37 +0000 (12:08 -0700)]
am
4a13c150: am
30a4fead: Merge "Use canonical UniquePtr.h header"
* commit '
4a13c150ffe58c53148bab8db32e647ef4e535e7':
Use canonical UniquePtr.h header
Kenny Root [Wed, 18 Sep 2013 19:05:24 +0000 (12:05 -0700)]
am
30a4fead: Merge "Use canonical UniquePtr.h header"
* commit '
30a4fead6c0dc70dff115ac9d9f79ac7c4646fde':
Use canonical UniquePtr.h header
SeungBeom Kim [Tue, 17 Sep 2013 00:39:46 +0000 (09:39 +0900)]
exynos_omx: multi_thread: Fix CodecReconfig issue.
Change-Id: I60494d236ca458c90d6b2a64c19980688517941d
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Bug:
10728106
SeungBeom Kim [Tue, 17 Sep 2013 01:03:40 +0000 (10:03 +0900)]
exynos_omx: multi_thread: Fix for dynamic resolution change timing issue.
Change-Id: I302de465745513a29dcacb33fe623c3cad7f6b1d
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Bug:
10192533
The Android Automerger [Wed, 18 Sep 2013 04:11:35 +0000 (21:11 -0700)]
merge in klp-release history after reset to klp-dev
Lajos Molnar [Tue, 17 Sep 2013 23:01:39 +0000 (16:01 -0700)]
am
07bbe49f: Merge "exynos_omx: multi_thread: Fix the return data length with EOS in meta data mode." into klp-dev
* commit '
07bbe49f0f6fa58abf567c41ca99c39d110839f4':
exynos_omx: multi_thread: Fix the return data length with EOS in meta data mode.
Lajos Molnar [Tue, 17 Sep 2013 22:54:23 +0000 (22:54 +0000)]
Merge "exynos_omx: multi_thread: Fix the return data length with EOS in meta data mode." into klp-dev
Colin Cross [Tue, 17 Sep 2013 18:22:41 +0000 (11:22 -0700)]
am
884ab8ad: Fix compile warning
* commit '
884ab8ada3f087be212c44aedc47d5e1fa959230':
Fix compile warning
Colin Cross [Mon, 16 Sep 2013 22:17:01 +0000 (15:17 -0700)]
Fix compile warning
Use int instead of enum in the getMemory function definition.
Change-Id: I0d4928f382fb63639fca4409ab28ddfae625fc9f