Yahan Zhou
|
a5ec8b0ec9
|
Merge "SoftVideoDecoderOMXComponent: max-size can be less than size"
|
7 years ago |
TreeHugger Robot
|
4cc3ed57fb
|
Merge "stagefright: allow secure audio input buffer"
|
7 years ago |
Dongwon Kang
|
287894593b
|
Merge "Merge "[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3 am: 6a53272e6f am: c3a52b7eaa" into oc-dr1-dev-plus-aosp am: b9b8869fa6" into oc-mr1-dev-plus-aosp
am: 0a40223c59
Change-Id: I76fb7aceb7c3f81622ec297a462f251dd03b7041
|
7 years ago |
Dongwon Kang
|
a9c3ba61c5
|
Merge "[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3 am: 6a53272e6f am: 7709475e7a am: 3e74d09a3d" into oc-mr1-dev-plus-aosp
am: 29de218b93
Change-Id: I7d15c3544cb20cec9c1806fc32be0b2325ba1a65
|
7 years ago |
Dongwon Kang
|
bcf3e76be8
|
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3 am: 6a53272e6f am: 7709475e7a am: 65b9b41e57
am: 82eacf9a7b
Change-Id: I88ed362545fc7e6f5c1569c9016110c67c22179d
|
7 years ago |
Caroline Tice
|
0b901e1926
|
[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am: a810630df2 am: 00824c3dfb am: 10ef0c6b11 am: 3078294720 am: af0f766ea4 am: 62548c00e8 am: adfbcd1cdf am: 2d57573eda
am: 8669e51e69
Change-Id: I58d816677d72fbca8a981096ba420840c9812124
|
7 years ago |
Caroline Tice
|
dbe17e05d9
|
Merge "[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am: a810630df2 am: 00824c3dfb am: 10ef0c6b11 am: 3078294720 am: af0f766ea4 am: 62548c00e8 am: bfb16d1394" into oc-dr1-dev-plus-aosp am: fdad13c92a
am: 844a4fc4b4
Change-Id: If603d2c30c4c58852c6733a670613cd82fd89141
|
7 years ago |
Lajos Molnar
|
e43861e476
|
[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into nyc-dr1-dev am: d55784db36 am: 7492e9c6aa am: e8cad97bb0 am: b33be95d6f am: e08d21ef28 am: ec7ccb0f70 am: 7d5f3fd7b6
am: a87d422cd9
Change-Id: I5e7aae3395c5aa65d6da7b820d5b28dae146ebfb
|
7 years ago |
Lajos Molnar
|
7a781e1b72
|
Merge "[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into cw-f-dev am: ae2d8ccc79 am: 02cf7d9038 am: dc41d373b4 am: f605ff40d8" into oc-dr1-dev-plus-aosp am: 414955e03b
am: fc7a65a649
Change-Id: Idfcb3eb870699cf5a6d2dc73a57b6e5488764cf5
|
7 years ago |
Lajos Molnar
|
33c9c9644e
|
[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into nyc-dr1-dev am: d55784db36 am: 7492e9c6aa am: e8cad97bb0 am: b33be95d6f am: e08d21ef28 am: 2d58e26b74 am: 4ee7eeee23
am: 9b0687fff3
Change-Id: I9c6de5c16c17ae7e29d159679b585d0c3bd77046
|
7 years ago |
Lajos Molnar
|
4fca219af9
|
Merge "[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into cw-f-dev am: ae2d8ccc79 am: 02cf7d9038 am: dc41d373b4 am: 608b18dfc6" into oc-dr1-dev-plus-aosp am: c674bb1558
am: 40789b9e78
Change-Id: Ifeeb209a81f031410d3e30915ff3f4945bb3ae72
|
7 years ago |
Dongwon Kang
|
bb0c45f573
|
Merge "[automerger] Merge "Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844" into nyc-dev am: 75a8372309 am: 86ebfcb7c4 am: 659570f8ef am: 050b66447c am: 7aa6ebe3e2 am: 6f8294fe90" into oc-dr1-dev-plus-aosp am: 5c173bd9a0
am: d111407557
Change-Id: Ia423a8638358ea4d6adab2a7ab15ef505fcd9378
|
7 years ago |
Dongwon Kang
|
2b47ccc391
|
[automerger] Merge "Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844" into nyc-dev am: 75a8372309 am: 86ebfcb7c4 am: 659570f8ef am: 050b66447c am: 7aa6ebe3e2 am: 8174a131ac am: d34b5cc69e
am: afa225727d
Change-Id: Ic8c4f3cdc14fe60490113192c51830d64899f28c
|
7 years ago |
Dongwon Kang
|
63d8b1e01c
|
Merge "[automerger] Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e" into nyc-dr1-dev am: bf0b6a90d3 am: e6b394e558 am: dd553a39a2 am: 8408963f51 am: 02aa77b1e6 am: 8dbed118e7" into oc-dr1-dev-plus-aosp am: c4eb1919fc
am: bed274f8f5
Change-Id: Ie183238413cc70e68eb9cb812955338e0577b7f8
|
7 years ago |
Dongwon Kang
|
5dea48350e
|
Merge "[automerger] Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e" into nyc-dr1-dev am: bf0b6a90d3 am: e6b394e558 am: dd553a39a2 am: 8408963f51 am: 02aa77b1e6 am: cba14ae57d" into oc-dr1-dev-plus-aosp am: fd5b0f9998
am: fc483cba85
Change-Id: I3b57dcb51136ad5af90dd0eaebdfd90606578c20
|
7 years ago |
Dongwon Kang
|
c18bcebe73
|
Merge "[automerger] Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-mr1-dev am: f1a596eb57" into cw-f-dev am: 64f7720a22 am: def0f4df7d am: 51121612b9 am: 3521b8099f" into oc-dr1-dev-plus-aosp am: 038d7279ed
am: 33cf4ccc50
Change-Id: Ide2ae76d26770eb22c144d08dec31001b32b408c
|
7 years ago |
Dongwon Kang
|
9d82d620ea
|
[automerger] Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-mr1-dev am: f1a596eb57" into cw-f-dev am: 64f7720a22 am: def0f4df7d am: 51121612b9 am: f20066daac am: ac777d4609
am: 01f99136dd
Change-Id: I66c50d02ef72c505b00ff1e0e4158d90312915b5
|
7 years ago |
Dongwon Kang
|
1f2f992b39
|
Merge "[automerger] Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e am: 06933f70bd am: 0157c3bc3c am: 4e7f895f5d am: 44039db28f am: bb30fb542c am: 0986acdd9b am: 8bac7ef166" into oc-mr1-dev-plus-aosp
am: b25ad4d89d
Change-Id: I0aea17c63e71e819019f1934f3ad80fd05d08ca3
|
7 years ago |
Caroline Tice
|
af5bf4936d
|
Merge "Merge "[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am: a810630df2 am: 00824c3dfb am: 10ef0c6b11 am: 3078294720 am: af0f766ea4 am: 62548c00e8 am: bfb16d1394" into oc-mr1-dev am: b56556ef73" into oc-mr1-dev-plus-aosp
am: 18ffb38bd4
Change-Id: Id60b7fc0c1213ebf85c8ee5a5246a1952f6c9b02
|
7 years ago |
Dongwon Kang
|
6e29c6793c
|
Merge "Merge "[automerger] Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844 am: a49b21ad39 am: 2f1346c362 am: b8257aad9e am: 5ff968b1ca am: 1235159945 am: 7d6245096b am: 99e1ca0ea5" into oc-dr1-dev-plus-aosp am: bcf9ec2bc0" into oc-mr1-dev-plus-aosp
am: 7ebad3d8fd
Change-Id: I5633a400ea57715039bfa523eb84be06929120ef
|
7 years ago |
Lajos Molnar
|
84d7deba3e
|
Merge "[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into nyc-dr1-dev am: d55784db36 am: 7492e9c6aa am: e8cad97bb0 am: b33be95d6f am: e08d21ef28 am: 2d58e26b74 am: b817df7ee8" into oc-mr1-dev-plus-aosp
am: 955412734e
Change-Id: I7797a2f9286ce7e313be49b2531b10aa67412ab9
|
7 years ago |
Dongwon Kang
|
11bc7bfa2b
|
Merge "Merge "[automerger] Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e am: 06933f70bd am: 0157c3bc3c am: 4e7f895f5d am: 44039db28f am: bb30fb542c am: 344c54c499" into oc-dr1-dev-plus-aosp am: b601476e49" into oc-mr1-dev-plus-aosp
am: 1fe697b58e
Change-Id: Ida6c49f648dce9a0c1711157b660d43c9b72bdeb
|
7 years ago |
Android Build Merger (Role)
|
0a40223c59
|
Merge "Merge "[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3 am: 6a53272e6f am: c3a52b7eaa" into oc-dr1-dev-plus-aosp am: b9b8869fa6" into oc-mr1-dev-plus-aosp
|
7 years ago |
Lajos Molnar
|
bb328f4ecd
|
Merge "[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into cw-f-dev am: ae2d8ccc79 am: 02cf7d9038 am: dc41d373b4 am: 608b18dfc6 am: 9b380976b6" into oc-mr1-dev-plus-aosp
am: b59820273a
Change-Id: I2352c5c680683459f02277e3a638978dca41859e
|
7 years ago |
Dongwon Kang
|
7f7c8527a2
|
Merge "[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3 am: 6a53272e6f am: c3a52b7eaa" into oc-dr1-dev-plus-aosp
am: b9b8869fa6
Change-Id: I796b1dd2382021f8d6c279322c21262867c2b5a1
|
7 years ago |
Android Build Merger (Role)
|
29de218b93
|
Merge "[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3 am: 6a53272e6f am: 7709475e7a am: 3e74d09a3d" into oc-mr1-dev-plus-aosp
|
7 years ago |
Dongwon Kang
|
e062d9ea21
|
Merge "Merge "[automerger] Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844 am: a49b21ad39 am: 2f1346c362 am: b8257aad9e am: 5ff968b1ca am: 1235159945 am: 7d6245096b am: 85e844b15f" into oc-dr1-dev-plus-aosp am: 73201e1d16" into oc-mr1-dev-plus-aosp
am: 298433a6bb
Change-Id: I5be440fd0ce6d75a0af6f57f3b0a781b583a33e4
|
7 years ago |
Dongwon Kang
|
b159992c44
|
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3 am: 6a53272e6f am: 7709475e7a
am: 3e74d09a3d
Change-Id: I9a78c014bda11c9bbfbe65fa9d0dccbfa705c594
|
7 years ago |
Dongwon Kang
|
82eacf9a7b
|
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3 am: 6a53272e6f am: 7709475e7a
am: 65b9b41e57
Change-Id: I601ff1e03e9ab887a8c4d238111e76eff03add36
|
7 years ago |
Dongwon Kang
|
cd46f9fef2
|
Merge "[automerger] Merge "Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844" into nyc-dev am: 75a8372309 am: 86ebfcb7c4 am: 659570f8ef am: 050b66447c am: 7aa6ebe3e2 am: 8174a131ac am: f17d6cb367" into oc-mr1-dev-plus-aosp
am: 11e5395754
Change-Id: Ibada6e5373eecc3657bdd2b66110fe2ab9149600
|
7 years ago |
Dongwon Kang
|
6aae88aded
|
Merge "Merge "[automerger] Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into cw-f-dev am: 9338cdaf46 am: 374e415b7f am: 18a851e9c9 am: 2d089b47d7" into oc-dr1-dev-plus-aosp am: e89280c85a" into oc-mr1-dev-plus-aosp
am: 73a33ed7dd
Change-Id: I0eb0b2e300c915db56194d51199f899fbddfc405
|
7 years ago |
Android Build Merger (Role)
|
b9b8869fa6
|
Merge "[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3 am: 6a53272e6f am: c3a52b7eaa" into oc-dr1-dev-plus-aosp
|
7 years ago |
Dongwon Kang
|
6fe3c05b0e
|
Merge "[automerger] Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e" into nyc-dr1-dev am: bf0b6a90d3 am: e6b394e558 am: dd553a39a2 am: 8408963f51 am: 02aa77b1e6 am: 8dbed118e7 am: 76b312f601" into oc-mr1-dev-plus-aosp
am: a5b883c6ff
Change-Id: I5e2dfec4fa2465862f10effd6d1baad5937838ff
|
7 years ago |
Dongwon Kang
|
3bc0456e45
|
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3 am: 6a53272e6f
am: c3a52b7eaa
Change-Id: I1c7c952fb82ad4c8a41c174cf0e67b4dc66097ab
|
7 years ago |
Dongwon Kang
|
65b9b41e57
|
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3 am: 6a53272e6f
am: 7709475e7a
Change-Id: I85a0eea9c430164faff23b342821bd04037d4f2a
|
7 years ago |
Dongwon Kang
|
3e74d09a3d
|
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3 am: 6a53272e6f
am: 7709475e7a
Change-Id: I299aedeaa3abe162c93e8b9b78ead0899874ba67
|
7 years ago |
Dongwon Kang
|
746490a360
|
Merge "[automerger] Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into cw-f-dev am: 9338cdaf46 am: 374e415b7f am: 18a851e9c9 am: 43dc82e949 am: 9f60238890" into oc-mr1-dev-plus-aosp
am: 4ed0c4362b
Change-Id: I56647d01ec9979f5f2702f50a352e47f6fbe7b6c
|
7 years ago |
Dongwon Kang
|
4c9b551658
|
[automerger] Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-mr1-dev am: f1a596eb57" into cw-f-dev am: 64f7720a22 am: def0f4df7d am: 51121612b9 am: 3521b8099f am: 21eaeb2005
am: 629acdac86
Change-Id: I2a2800e046c7bd220e1975266ebd039760e6485e
|
7 years ago |
Dongwon Kang
|
f11d0c3285
|
[automerger] Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e am: 06933f70bd am: 0157c3bc3c am: 4e7f895f5d am: 44039db28f am: bb30fb542c am: 344c54c499 am: ede1074afb
am: bba0a6206d
Change-Id: Ic8c52d9e849089c4645b7309b23882bf1978dda0
|
7 years ago |
Dongwon Kang
|
c3a52b7eaa
|
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3
am: 6a53272e6f
Change-Id: I786a5d1fcff974f42a17349d9e1ccd78dd5de6b3
|
7 years ago |
Dongwon Kang
|
7709475e7a
|
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3
am: 6a53272e6f
Change-Id: I2daeea1b47b32953fb4ea3f4860bff6819df42ec
|
7 years ago |
Dongwon Kang
|
0558523e10
|
[automerger] Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844 am: a49b21ad39 am: 2f1346c362 am: b8257aad9e am: 5ff968b1ca am: 1235159945 am: 7d6245096b am: 85e844b15f am: 16899f6c84
am: 39b9bbc50b
Change-Id: I3164f3181c686835c536649b2b405e5a458646e3
|
7 years ago |
Dongwon Kang
|
98ec7bf704
|
[automerger] Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into cw-f-dev am: 9338cdaf46 am: 374e415b7f am: 18a851e9c9 am: 43dc82e949 am: 321581688f
am: 9f9bbf8eba
Change-Id: I297535d06984a9782d56a927781c09da98687aaf
|
7 years ago |
Dongwon Kang
|
187caab891
|
Merge "[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into mnc-dr1.5-dev am: 6e4c870d0a am: 105295f24b am: b8b727d04a am: 2ca5d02c11 am: 06efbf2c98 am: e010d848da am: bdeb664822 am: 5a1bb75b1e am: 263cdd11b1" into oc-mr1-dev-plus-aosp
am: e14643e432
Change-Id: I659ada604decc2159c2256c70a1f20588dea6c75
|
7 years ago |
Dongwon Kang
|
41f74191b5
|
Merge "Merge "[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into mnc-dr1.5-dev am: 6e4c870d0a am: 105295f24b am: b8b727d04a am: 2ca5d02c11 am: 06efbf2c98 am: e010d848da am: bdeb664822 am: 5a1bb75b1e" into oc-dr1-dev-plus-aosp am: 5f1e50d3eb" into oc-mr1-dev-plus-aosp
am: 80fb707cd3
Change-Id: I43965db54dc2c95554bc77a1758029f78659b4e0
|
7 years ago |
Dongwon Kang
|
ed0040d75d
|
Merge "[automerger] Merge "Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am: 624243ea5c" into mnc-dr1.5-dev am: f2ad6db91e am: 7b9c0079b7 am: e6de027b05 am: 45ac425f45 am: 604fdb025c am: 48161562d1 am: d6058293f4 am: cb69598a7a am: c44e6064d9" into oc-mr1-dev-plus-aosp
am: 8ff7b84271
Change-Id: Ia9205d49c6ee370c7ec0493876d75f128601487f
|
7 years ago |
Dongwon Kang
|
45e3fa53fc
|
Merge "Merge "[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into mnc-dr1.5-dev am: 6e4c870d0a am: 105295f24b am: b8b727d04a am: 2ca5d02c11 am: 06efbf2c98 am: e010d848da am: bdeb664822 am: 06f90f899e" into oc-dr1-dev-plus-aosp am: c6b394b8ed" into oc-mr1-dev-plus-aosp
am: c8610ce1f0
Change-Id: I00c11ecc98a619788d246039e878831dafdde27c
|
7 years ago |
Dongwon Kang
|
1e0ae23ea1
|
Merge "[automerger] Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-dev am: 3815133611 am: 633566e2b7 am: c527ced637 am: 1285f5bda9 am: 633546196e am: 5ab2631934 am: 3cb6898ec2 am: acfe162868" into oc-mr1-dev-plus-aosp
am: 1005eaf217
Change-Id: Ie4dc572d137a1c586f632271d2899bb956a69f66
|
7 years ago |
Dongwon Kang
|
b536d6abde
|
Merge "[automerger] Merge "Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am: 624243ea5c" into mnc-dr1.5-dev am: f2ad6db91e am: 7b9c0079b7 am: e6de027b05 am: 45ac425f45 am: 604fdb025c am: 48161562d1 am: d6058293f4 am: cb69598a7a" into oc-dr1-dev-plus-aosp am: d44e4f075d
am: 56dcca1dc7
Change-Id: Ic95203a6017ff7b8ff719a685d1602e9f65f8b89
|
7 years ago |
Dongwon Kang
|
f469967a61
|
Merge "[automerger] Merge "Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am: 624243ea5c" into mnc-dr1.5-dev am: f2ad6db91e am: 7b9c0079b7 am: e6de027b05 am: 45ac425f45 am: 604fdb025c am: 48161562d1 am: d6058293f4 am: ec2c711551" into oc-dr1-dev-plus-aosp am: 273a2c308e
am: a1977a01de
Change-Id: If9ba0d144c92d60fbcff115fe3fc36e7d0f9ab85
|
7 years ago |