summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-07Merge "Remove HAVE_UNWIND_CONTEXT_STRUCT from hardware/ti/omap4xxx."HEADandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-wear-5.1.1_r1android-wear-5.1.0_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4android-n-iot-preview-2android-m-preview-2android-m-preview-1android-m-previewandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-wear-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-iot-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releasen-iot-preview-4n-iot-preview-2master-soongmastermarshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releasemainElliott Hughes
2015-01-07Remove HAVE_UNWIND_CONTEXT_STRUCT from hardware/ti/omap4xxx.Elliott Hughes
Change-Id: I2984f3958a7fbf1c3cc76eead3ab72fed7da22a3
2014-12-16Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang
2014-12-16Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang
Bug: 18675947 Change-Id: Ib4061f5d92bb04fa8167e02767edc3c5a5632474
2014-04-30am 734ca303: am c32caab8: am 0fbe7ecf: libexif is now libjheadandroid-wear-5.0.0_r1android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseMarco Nelissen
* commit '734ca3030210e23192ce94a5b35b9ac1a0ad0934':
2014-04-30am c32caab8: am 0fbe7ecf: libexif is now libjheadMarco Nelissen
* commit 'c32caab84ff9edc1489ed6c8079c7d252caafc4d':
2014-03-07am 0fbe7ecf: libexif is now libjheadandroid-l-preview_r2l-previewMarco Nelissen
* commit '0fbe7ecfb0a526c02b774208fa00e0cba19d13a4': libexif is now libjhead
2014-03-07am df1b83e1: am 0fbe7ecf: libexif is now libjheadMarco Nelissen
* commit 'df1b83e11a7694ec7c5a6fdf5617a966afcdf232': libexif is now libjhead
2014-03-07am 0fbe7ecf: libexif is now libjheadMarco Nelissen
* commit '0fbe7ecfb0a526c02b774208fa00e0cba19d13a4': libexif is now libjhead
2014-03-06libexif is now libjheadandroid-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-devMarco Nelissen
b/12203995 Change-Id: I78c3eae1dc3a3e37da182513078749ad83d6d004
2013-12-19libexif is now libjheadMarco Nelissen
Change-Id: I78c3eae1dc3a3e37da182513078749ad83d6d004
2013-10-31Merge "camera: do not use GNU old-style field designators"idea133-weekly-releaseidea133Nick Kralevich
2013-11-02camera: do not use GNU old-style field designatorssynergydev
Avoiding the use of GNU extensions improves portability Fixes the following: error: use of GNU old-style field designator extension Change-Id: Ic1bf7e44b3bf0c9b30c8c950b02ad71452a0bd8f
2013-04-22camera: Handle capture request in AF runandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2kitkat-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devAlex Ray
Bug: 8140969 Change-Id: I1e1889434d57714cdb0c10929609eade299c1ea9
2013-04-09Add liblogYing Wang
Bug: 8580410 Change-Id: If897b4d39c67a49aa590b1692d26db794a53c2a3
2013-03-28cleanupJean-Baptiste Queru
Change-Id: Id710a5b742eb81351f0ef14a331824293b4df522
2013-03-22Fix native test's calls to camera libraryEino-Ville Talvala
Change-Id: I816bd24669229c3ff3a8397c516080c7d409455f
2013-03-12remove Surface uses in favor of IGraphicBufferProducerMathias Agopian
Change-Id: I0d52884fbe80aa7f29f71bfbedd62162601a1360
2012-12-03am 32f08e77: Merge "Panda: Set lcd_xpy to 1 if the x/y res and dimensions ↵Jean-Baptiste Queru
are not set" * commit '32f08e77913e7938f5982276a3c44d93d8091498': Panda: Set lcd_xpy to 1 if the x/y res and dimensions are not set
2012-12-03Merge "Panda: Set lcd_xpy to 1 if the x/y res and dimensions are not set"tools_r22jb-mr1.1-dev-plus-aospjb-mr1-dev-plus-aospJean-Baptiste Queru
2012-12-03Panda: Set lcd_xpy to 1 if the x/y res and dimensions are not setDan Murphy
Since the panda uses HDMI and DVI only there is no setting to indicate the x/y res or dimensions. There fore if these values are not set in the kernel set the lcd_xpy to 1 Change-Id: I538eb0fc059daebfa3fe125cbdf0b70eb51f1616 Signed-off-by: Dan Murphy <dmurphy@ti.com>
2012-11-08am 015960eb: am 707e301d: Revert "CameraHal: Sync AF cancel with incoming ↵Eino-Ville Talvala
OMX events" * commit '015960eb1f62f682432137441737d8440a871536': Revert "CameraHal: Sync AF cancel with incoming OMX events"
2012-11-08am 707e301d: Revert "CameraHal: Sync AF cancel with incoming OMX events"Eino-Ville Talvala
* commit '707e301de8b52780a7f0e88e6f25ac919c23671f': Revert "CameraHal: Sync AF cancel with incoming OMX events"
2012-11-07Revert "CameraHal: Sync AF cancel with incoming OMX events"android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-devEino-Ville Talvala
This reverts commit b96dffd40e25d29a61f9fbd7f2e5968b5335b957. Bug: 7495861
2012-11-05am 646723c0: am b96dffd4: CameraHal: Sync AF cancel with incoming OMX eventsEmilian Peev
* commit '646723c06120cc9344463f6b3f001178e606838f': CameraHal: Sync AF cancel with incoming OMX events
2012-11-05am b96dffd4: CameraHal: Sync AF cancel with incoming OMX eventsEmilian Peev
* commit 'b96dffd40e25d29a61f9fbd7f2e5968b5335b957': CameraHal: Sync AF cancel with incoming OMX events
2012-10-30Remove obsolete references to libmedia_nativeGlenn Kasten
Bug: 6654403 Change-Id: I56fbf4925d64670c9d0ce7c8ba78ab6462abee2d
2012-10-26Add embedded omap4 targetMike Lockwood
Change-Id: I901fb32c51d05ccc6dbff8f4de17364efac12da3 Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-10-23CameraHal: Sync AF cancel with incoming OMX eventsEmilian Peev
- Cancel AF is made to wait on incoming OMX events when AF status changes. An AF timeout is introduced in order not to block this call indefinitely. - Additionally calls to 'autoFocus()' will immediately trigger AF callbacks if fixed modes are being used. Bug: 6949572 Change-Id: I5f240fb6fc7fe53aecaff76d75d608dd522c1e27 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
2012-10-16Merge "Add conditional on TARGET_BOARD_PLATFORM_VARIANT" into jb-mr1-aah-devMike J. Chen
2012-10-15Add conditional on TARGET_BOARD_PLATFORM_VARIANTMike J. Chen
Only build if TARGET_BOARD_PLATFORM_VARIANT is not set. Boards (like phantasm) will set TARGET_BOARD_PLATFORM_VARIANT when they want to use a different set of hardware files (like hardware/ti/omap4-aah) and not the ones in this project. Change-Id: I2cd921a97ae66b08494c65e038022fa3c739de72 Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-10-15CameraHal: Avoid race condition during recording stopEmilian Peev
- A race condition is possible when recording is stopped. 'BaseCameraAdapter::stopVideoCapture()' is clearing 'mVideoBuffersAvailable'. A delayed video frame from 'AppCallbackNotifier' can return afterwards though and then try to query the already empty 'KeyedVector'. This will result in a segfault. Solution is to move the vector reset away from 'stopVideoCapture()' and in to 'startVideoCapture()' where it is needed. Bug: 7021214 Change-Id: Ic234189b49e35c990b3af70bd713a12cb762362c Signed-off-by: Emilian Peev <epeev@mm-sol.com>
2012-09-12HWC field was renamedJesse Hall
Change-Id: If08258776db427c45d9ba70cfa79f4d290398ca6
2012-08-24Use new surface flinger API.Jeff Brown
Change-Id: I90a00bd284a5d800f0f0eac5616ffa9ce14303c0
2012-08-22Update for cleanups in hwc interfaceJesse Hall
Change-Id: I7851cd5ca7cd826b3b4b35e6df90ce1e2a9f4327
2012-08-21Update the omap4xxx HWC to use the 1.0 interfacesAndy McFadden
Switch to HWC_DEVICE_API_VERSION_1_0 and the corresponding structures. This change removes special-case handling for Panda, which was using v0.2. This will likely break the Panda display. Change-Id: Id9ba6910ae2285d116f697bfa5af2c1f6b022ce0
2012-08-03Merge "Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries"" into jb-mr1-devJames Dong
2012-08-03Merge "Fix the build." into jb-mr1-devJim Miller
2012-08-03Fix the build.Jim Miller
Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries" This reverts commit 6e18d140dfd80193121abf35764b8dad2f369041 Change-Id: Ia2cb66fc1f88298df675b9085b16c83558dede62
2012-08-03Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries"Edwin Wong
This reverts commit 6e18d140dfd80193121abf35764b8dad2f369041 Change-Id: Idcedbc1cc744c42c06e5c731b3c60355414e6add
2012-08-03Merge "Revert Widevine 6.0.0 -> 4.5.0 libraries" into jb-mr1-devEdwin Wong
2012-08-03Revert Widevine 6.0.0 -> 4.5.0 librariesEdwin Wong
Includes Widevine libraries Version 4.5.0.7809 Also fixed samplePlayer's MediaCodec mode not running and WVDrmInfoRequestStatusKey returning incorrect value. Change-Id: I1d7df9cf3935d7fec143e326f142e974979cc69b related-to-bug: 6929628 related-to-bug: 6833718 related-to-bug: 6889322
2012-08-02am 53835e97: Merge "OMAP4:Panda: Use old hwcomposer API version for panda"Jean-Baptiste Queru
* commit '53835e97845edf78d513010ae4faa8fc467f0a6c': OMAP4:Panda: Use old hwcomposer API version for panda
2012-08-02Merge "OMAP4:Panda: Use old hwcomposer API version for panda"tools_r21Jean-Baptiste Queru
2012-08-02OMAP4:Panda: Use old hwcomposer API version for pandaDan Murphy
The hwcomposer for OMAP4 is generic to the all OMAP4 processors. Panda does not support Vsync protocal which is expected when the HAL declares an API support level of 0.3. Therefore indicate to the upper layers that if the product is panda then only API level 0.2 is supported which then forces upper layers to fake the vsync signal Change-Id: I22a39f55ea017ced25424556ffc95b099d0a2781 Signed-off-by: Dan Murphy <dmurphy@ti.com>
2012-07-17Merge "Remove libdrmdecrypt from AOSP build."Fred
2012-07-09Fixup ion change to old libraryRebecca Schultz Zavin
Missed a few places that needed updating Change-Id: I1a483d9d85858e752df0f1d970559fcac6695856 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2012-07-07Remove libdrmdecrypt from AOSP build.Fred
Not all boards that use the omap4 chipset need to have the drm library. In particular, the panda does not. The libdrmdecrypt make file was moved from hardware/ti/omap4xxx, to vendor/ti/proprietary. The directory libdrmdecrypt was removed in this change, and added in change Icbeb6c5c. The dependency on libdrmdecrypt was removed from omap4.mk and added to tuna_common.mk in change Ia1019321. Change-Id: Iaad4d1122809ad67869d7515c5c5009a048bb1c2
2012-06-29am 692b0d66: Reconcile with jb-releaseThe Android Open Source Project
* commit '692b0d6601761e7b1c1f8cb9581358d77551d4dd':
2012-06-29Reconcile with jb-releaseThe Android Open Source Project
Change-Id: I4deb64bb027bc5216883f21f97502ae54c97fd39
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 11:56:43 +0000