-
5674f27 Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main by Xin Li · 1 year, 8 months ago main master
-
ce1a378 Merge 25Q1 (ab/BP1A.250305.020) to AOSP main by Xin Li · 1 year, 8 months ago
-
a82fe69 Merge "Merge 25Q1 (ab/12770256) to aosp-main-future" into aosp-main-future by Xin Li · 1 year, 9 months ago tmp_25Q1_merge
-
66a7a2b Merge "Disable -Wcast-function-type-mismatch" into main am: 8dc5904d43 by Treehugger Robot · 1 year, 9 months ago
-
8dc5904 Merge "Disable -Wcast-function-type-mismatch" into main by Treehugger Robot · 1 year, 9 months ago
-
9505aad Disable -Wcast-function-type-mismatch by Aditya Kumar · 1 year, 9 months ago
-
a505d5a Merge 25Q1 (ab/12770256) to aosp-main-future by Xin Li · 1 year, 9 months ago
-
3bec44c Merge "[owners] Remove gkasten@google.com from OWNERS" into main am: 22c44bb5b9 by Owner Cleanup Bot · 1 year, 9 months ago
-
22c44bb Merge "[owners] Remove gkasten@google.com from OWNERS" into main by Owner Cleanup Bot · 1 year, 9 months ago
-
d9e68e5 [owners] Remove gkasten@google.com from OWNERS by Owner Cleanup Bot · 1 year, 9 months ago
-
50a2ae1 Use DeviceIdVector in OpenSL ES by Robert Wu · 2 years ago
-
e48cd39 [automerger skipped] Skip 24Q4 in aosp-main-future am: b44ee63913 -s ours by Xin Li · 2 years, 1 month ago
-
b44ee63 Skip 24Q4 in aosp-main-future by Xin Li · 2 years, 1 month ago
-
3400ad8 [automerger skipped] Merge "Take local copy of CallbackProtector in Callbacks" into main am: 094799c58d am: 5e604d6fbb -s ours by Treehugger Robot · 2 years, 2 months ago
-
5e604d6 Merge "Take local copy of CallbackProtector in Callbacks" into main am: 094799c58d by Treehugger Robot · 2 years, 2 months ago
-
094799c Merge "Take local copy of CallbackProtector in Callbacks" into main by Treehugger Robot · 2 years, 2 months ago
-
df78e7f Merge "libwilhelm: Remove direct usage of TrackPlayerBase::mAudioTrack" into main am: 6a6c177d80 am: b85ecbb09a by Mikhail Naganov · 2 years, 2 months ago
-
b85ecbb Merge "libwilhelm: Remove direct usage of TrackPlayerBase::mAudioTrack" into main am: 6a6c177d80 by Mikhail Naganov · 2 years, 2 months ago
-
6a6c177 Merge "libwilhelm: Remove direct usage of TrackPlayerBase::mAudioTrack" into main by Mikhail Naganov · 2 years, 2 months ago
-
387aaed libwilhelm: Remove direct usage of TrackPlayerBase::mAudioTrack by Tomislav Novak · 2 years, 2 months ago
-
ecd0123 Take local copy of CallbackProtector in Callbacks by Atneya Nair · 2 years, 2 months ago
-
4260423 Merge "Remove NDK exports" into main am: 0e5c075c01 am: 89c89fe9c7 by Steven Moreland · 2 years, 2 months ago
-
89c89fe Merge "Remove NDK exports" into main am: 0e5c075c01 by Steven Moreland · 2 years, 2 months ago
-
0e5c075 Merge "Remove NDK exports" into main by Steven Moreland · 2 years, 2 months ago
-
103f8c8 Remove NDK exports by Steven Moreland · 2 years, 2 months ago
-
9f580a6 Take local copy of CallbackProtector in Callbacks by Atneya Nair · 2 years, 3 months ago
-
7cf938e Merge "Rename CodecCapabilities to avoid conflict." into main am: 7db6c6133b am: c43ef8c275 by Songyue Han · 2 years, 4 months ago
-
c43ef8c Merge "Rename CodecCapabilities to avoid conflict." into main am: 7db6c6133b by Songyue Han · 2 years, 4 months ago
-
7db6c61 Merge "Rename CodecCapabilities to avoid conflict." into main by Songyue Han · 2 years, 4 months ago
-
093ecc5 Rename CodecCapabilities to avoid conflict. by Songyue Han · 2 years, 7 months ago
-
bf07cb5 [automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 2428f87453 -s ours by Xin Li · 2 years, 7 months ago android15-tests-dev
-
2428f87 Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future by Xin Li · 2 years, 7 months ago
-
9a668bf [automerger skipped] Merge "OpenSLES: Fix deprecated volatile op warning" into main am: e7a596c480 am: 4e0d2475a5 -s ours by Andy Hung · 2 years, 9 months ago
-
4e0d247 Merge "OpenSLES: Fix deprecated volatile op warning" into main am: e7a596c480 by Andy Hung · 2 years, 9 months ago
-
e7a596c Merge "OpenSLES: Fix deprecated volatile op warning" into main by Andy Hung · 2 years, 9 months ago
-
4129621 OpenSLES: Fix deprecated volatile op warning by Andy Hung · 2 years, 9 months ago
-
4fa0ef9 Merge "OpenSLES: Fix deprecated volatile op warning" into main by Andy Hung · 2 years, 9 months ago
-
1fc782b OpenSLES: Fix deprecated volatile op warning by Andy Hung · 2 years, 9 months ago
-
f06c4db [automerger skipped] Merge "OpenSLES: Remove unused variable" into main am: 3a22ade537 am: 1319069e0a -s ours by Andy Hung · 2 years, 9 months ago
-
1319069 Merge "OpenSLES: Remove unused variable" into main am: 3a22ade537 by Andy Hung · 2 years, 9 months ago
-
3a22ade Merge "OpenSLES: Remove unused variable" into main by Andy Hung · 2 years, 9 months ago
-
e3449ae OpenSLES: Remove unused variable by Andy Hung · 2 years, 9 months ago
-
f6a1663 Merge "OpenSLES: Remove unused variable" into main by Andy Hung · 2 years, 9 months ago
-
74201b7 OpenSLES: Remove unused variable by Andy Hung · 2 years, 9 months ago
-
3f6ff05 Merge "Migrate Test Targets to New Android Ownership Model" into main am: 46cc662ad8 am: ff72cf70c9 by Treehugger Robot · 2 years, 9 months ago
-
ff72cf7 Merge "Migrate Test Targets to New Android Ownership Model" into main am: 46cc662ad8 by Treehugger Robot · 2 years, 9 months ago
-
46cc662 Merge "Migrate Test Targets to New Android Ownership Model" into main by Treehugger Robot · 2 years, 9 months ago
-
1856280 Migrate Test Targets to New Android Ownership Model by Aditya Choudhary · 2 years, 10 months ago
-
feda72d Merge "Fix -Wfortify-source compiler warning" into main am: f9dd5c05fa am: c2909ee2f6 am: e0bf3b3972 by Treehugger Robot · 3 years ago
-
4006419 Merge "Fix -Wfortify-source compiler warning" into main am: f9dd5c05fa am: d1586be9cd am: 8ac423ec9a by Treehugger Robot · 3 years ago
-
e0bf3b3 Merge "Fix -Wfortify-source compiler warning" into main am: f9dd5c05fa am: c2909ee2f6 by Treehugger Robot · 3 years ago
-
8ac423e Merge "Fix -Wfortify-source compiler warning" into main am: f9dd5c05fa am: d1586be9cd by Treehugger Robot · 3 years ago
-
c2909ee Merge "Fix -Wfortify-source compiler warning" into main am: f9dd5c05fa by Treehugger Robot · 3 years ago
-
d1586be Merge "Fix -Wfortify-source compiler warning" into main am: f9dd5c05fa by Treehugger Robot · 3 years ago
-
f9dd5c0 Merge "Fix -Wfortify-source compiler warning" into main by Treehugger Robot · 3 years ago
-
c6e3985 Fix -Wfortify-source compiler warning by Yi Kong · 3 years ago
-
2b846f4 [automerger skipped] Merge "Merge Android 14" into main am: 1c05b41c29 -s ours am: 755322cdff -s ours am: 3449e2d050 -s ours am: 8003b3708c -s ours am: 64aff67667 -s ours by Xin Li · 3 years, 1 month ago
-
acb8b32 [automerger skipped] Merge Android 14 am: e27d575542 -s ours am: 24bda53c07 -s ours am: ecb21e9bbb -s ours am: 4abada4baf -s ours am: 44d5b2c5ab -s ours by Xin Li · 3 years, 1 month ago
-
64aff67 [automerger skipped] Merge "Merge Android 14" into main am: 1c05b41c29 -s ours am: 755322cdff -s ours am: 3449e2d050 -s ours am: 8003b3708c -s ours by Xin Li · 3 years, 1 month ago
-
44d5b2c [automerger skipped] Merge Android 14 am: e27d575542 -s ours am: 24bda53c07 -s ours am: ecb21e9bbb -s ours am: 4abada4baf -s ours by Xin Li · 3 years, 1 month ago
-
8003b37 [automerger skipped] Merge "Merge Android 14" into main am: 1c05b41c29 -s ours am: 755322cdff -s ours am: 3449e2d050 -s ours by Xin Li · 3 years, 1 month ago
-
4abada4 [automerger skipped] Merge Android 14 am: e27d575542 -s ours am: 24bda53c07 -s ours am: ecb21e9bbb -s ours by Xin Li · 3 years, 1 month ago
-
3449e2d [automerger skipped] Merge "Merge Android 14" into main am: 1c05b41c29 -s ours am: 755322cdff -s ours by Xin Li · 3 years, 1 month ago
-
ecb21e9 [automerger skipped] Merge Android 14 am: e27d575542 -s ours am: 24bda53c07 -s ours by Xin Li · 3 years, 1 month ago
-
755322c [automerger skipped] Merge "Merge Android 14" into main am: 1c05b41c29 -s ours by Xin Li · 3 years, 1 month ago
-
24bda53 [automerger skipped] Merge Android 14 am: e27d575542 -s ours by Xin Li · 3 years, 1 month ago
-
1c05b41 Merge "Merge Android 14" into main by Xin Li · 3 years, 1 month ago
-
e27d575 Merge Android 14 by Xin Li · 3 years, 1 month ago
-
ba2be29 [automerger skipped] Merge Android U (ab/10368041) am: 798c73a516 -s ours am: e5ab7771b5 -s ours am: 63bc9031f1 -s ours am: dd0d5e2512 -s ours by Xin Li · 3 years, 3 months ago
-
dd0d5e2 [automerger skipped] Merge Android U (ab/10368041) am: 798c73a516 -s ours am: e5ab7771b5 -s ours am: 63bc9031f1 -s ours by Xin Li · 3 years, 3 months ago
-
63bc903 [automerger skipped] Merge Android U (ab/10368041) am: 798c73a516 -s ours am: e5ab7771b5 -s ours by Xin Li · 3 years, 3 months ago
-
e5ab777 [automerger skipped] Merge Android U (ab/10368041) am: 798c73a516 -s ours by Xin Li · 3 years, 3 months ago
-
798c73a Merge Android U (ab/10368041) by Xin Li · 3 years, 3 months ago
-
b9e120f Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c am: 8de33234b5 by Eric Laurent · 3 years, 5 months ago
-
572b691 Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c am: b88e70f31d am: 9d23b316ab am: 18971a1f4f by Eric Laurent · 3 years, 6 months ago
-
34e1aac Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c am: b5bb7835af am: 34c1879ae5 am: c69b3e878d by Eric Laurent · 3 years, 6 months ago
-
61dadf2 Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c am: b88e70f31d am: 753713172a am: 372faf601a by Eric Laurent · 3 years, 6 months ago
-
18971a1 Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c am: b88e70f31d am: 9d23b316ab by Eric Laurent · 3 years, 6 months ago
-
c69b3e8 Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c am: b5bb7835af am: 34c1879ae5 by Eric Laurent · 3 years, 6 months ago
-
372faf6 Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c am: b88e70f31d am: 753713172a by Eric Laurent · 3 years, 6 months ago
-
9d23b31 Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c am: b88e70f31d by Eric Laurent · 3 years, 6 months ago
-
2bc3989 Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c am: f683c0e239 by Eric Laurent · 3 years, 6 months ago
-
34c1879 Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c am: b5bb7835af by Eric Laurent · 3 years, 6 months ago
-
7537131 Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c am: b88e70f31d by Eric Laurent · 3 years, 6 months ago android14-d2-release android14-d2-s1-release android14-d2-s2-release android14-d2-s3-release android14-d2-s4-release android14-d2-s5-release android14-qpr1-automotiveos-release android-14.0.0_r38 android-14.0.0_r39 android-14.0.0_r40 android-14.0.0_r41 android-14.0.0_r42 android-14.0.0_r43 android-14.0.0_r44 android-14.0.0_r45 android-automotiveos-14.0.0_lts2 android-automotiveos-14.0.0_lts3 android-automotiveos-14.0.0_lts4 android-automotiveos-14.0.0_lts5 android-automotiveos-14.0.0_lts6 android-automotiveos-14.0.0_lts7
-
b5bb783 Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c by Eric Laurent · 3 years, 6 months ago
-
f683c0e Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c by Eric Laurent · 3 years, 6 months ago
-
8de3323 Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c by Eric Laurent · 3 years, 6 months ago
-
b88e70f Android audio player: use audio attributes instead of legacy stream type am: 53ac8c773c by Eric Laurent · 3 years, 6 months ago
-
53ac8c7 Android audio player: use audio attributes instead of legacy stream type by Eric Laurent · 3 years, 6 months ago android14-dev android14-prebuilt-test
-
8ccadba [automerger skipped] Rename `MAX_INDEX` macro to `SLES_MAX_INDEX` am: 67bb36c5a4 am: 3d9b9d8071 -s ours am: 74b18ebf85 -s ours by Mikhail Naganov · 3 years, 7 months ago
-
f882ab2 [automerger skipped] Rename `MAX_INDEX` macro to `SLES_MAX_INDEX` am: 67bb36c5a4 -s ours am: 2b1b9c1a5b -s ours am: 11a113a641 -s ours by Mikhail Naganov · 3 years, 7 months ago
-
74b18eb [automerger skipped] Rename `MAX_INDEX` macro to `SLES_MAX_INDEX` am: 67bb36c5a4 am: 3d9b9d8071 -s ours by Mikhail Naganov · 3 years, 7 months ago
-
1630882 [automerger skipped] Rename `MAX_INDEX` macro to `SLES_MAX_INDEX` am: 67bb36c5a4 am: 4387452a44 -s ours by Mikhail Naganov · 3 years, 7 months ago
-
11a113a [automerger skipped] Rename `MAX_INDEX` macro to `SLES_MAX_INDEX` am: 67bb36c5a4 -s ours am: 2b1b9c1a5b -s ours by Mikhail Naganov · 3 years, 7 months ago
-
3d9b9d8 Rename `MAX_INDEX` macro to `SLES_MAX_INDEX` am: 67bb36c5a4 by Mikhail Naganov · 3 years, 7 months ago
-
4387452 Rename `MAX_INDEX` macro to `SLES_MAX_INDEX` am: 67bb36c5a4 by Mikhail Naganov · 3 years, 7 months ago
-
2b1b9c1 [automerger skipped] Rename `MAX_INDEX` macro to `SLES_MAX_INDEX` am: 67bb36c5a4 -s ours by Mikhail Naganov · 3 years, 7 months ago
-
67bb36c Rename `MAX_INDEX` macro to `SLES_MAX_INDEX` by Mikhail Naganov · 3 years, 7 months ago
-
38bcf0a Merge "Rename `MAX_INDEX` macro to `SLES_MAX_INDEX`" am: c905807850 am: 969f5d4259 am: 0762dfa34f am: 5934f563bf am: 55be9dfad0 by Treehugger Robot · 3 years, 7 months ago
-
55be9df Merge "Rename `MAX_INDEX` macro to `SLES_MAX_INDEX`" am: c905807850 am: 969f5d4259 am: 0762dfa34f am: 5934f563bf by Treehugger Robot · 3 years, 7 months ago