Age | Commit message (Collapse) | Author |
|
a1ded2684a am: f8d46ecb0e am: b4a03abdd9
Change-Id: Idb62673139a8084dfd6d0b8e7973fed31f804cee
|
|
a1ded2684a am: f8d46ecb0e
Change-Id: I4a7079cfecedaf5ac81f5166b9972360f0e6a7af
|
|
a1ded2684a
Change-Id: I56329e2267ffb4988ca6259758bef370509cf9f6
|
|
Change-Id: I903a24cb2a019ea93d0cc43dafce1abc78e1a75b
|
|
Change-Id: Ife8cc820ee2f6cc6a5010a2d14d47358d348ca24
|
|
Bug: 68860345
Bug: 69058154
Bug: 151953481
Test: no code changes
Change-Id: I5f9876d6dd6a9c08d3361d6ab753f92be39adee2
|
|
stag-aosp-master am: 02d6e74ded -s ours am: 49b6696606 am: 7b2e67bca8 am: e35c3d3015 -s ours
am skip reason: subject contains skip directive
Change-Id: If14b4d653142e2d2088253e68763b2043aa86d0f
|
|
stag-aosp-master am: 02d6e74ded -s ours am: 49b6696606 am: 7b2e67bca8
Change-Id: I7b8089bf530f916143a61e0fbf751ce13fb25223
|
|
stag-aosp-master am: 02d6e74ded -s ours am: 49b6696606
Change-Id: I09021795fd371f74736baf51db0aac7c390083e8
|
|
stag-aosp-master am: 02d6e74ded -s ours
am skip reason: subject contains skip directive
Change-Id: I056cbadbf703438c1468ecd947995aebdebf1d21
|
|
Bug: 151763422
Change-Id: I1a9df8851be2d6efc360266b6599f3bd671d026b
|
|
am: 7d3eaaf5c9 am: 356d3a8c0f am: be310c3d68
Change-Id: If597a5c7f03e9108e9def4045d9b6d508fd6e8ee
|
|
am: 7d3eaaf5c9 am: 356d3a8c0f
Change-Id: I943321be8e9d1b5edf873ac420e6997944d8e458
|
|
am: 7d3eaaf5c9
Change-Id: I0871e40e8401e020d79f97977efdf18670896e79
|
|
Change-Id: Id1d913e1a7979ca9278e74c1e542b3246a34d35f
|
|
Change-Id: I3346513f9e979dca18a8c73ea90cfbf5a57153a6
|
|
Change-Id: If0e4bb35f9d0fe8f0f982f5793c83517e7dae951
|
|
Identified using the below shell script:
$ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \
| while read dir; do \
if [ -f "${dir}/NOTICE" ] \
&& diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \
echo "${dir}/NOTICE"; \
fi; \
done
Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are
merged, LICENSE files copied into NOTICE files are no longer needed.
Bug: 67772237
Bug: 68860345
Test: manually built and diffed before and after system image notices
Change-Id: Ic85f87c7bf3aa29d38d56ac600bb70d8dc4a8e48
|
|
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 5f25b45491 -s ours am: 62be9affe5 am: ec12a00117 am: fd82db7735 -s ours
am skip reason: subject contains skip directive
Change-Id: I889ea3b499e940140cb5a6e0f11f984688030fd1
|
|
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 5f25b45491 -s ours am: 62be9affe5 am: ec12a00117
Change-Id: I49200c8ca2c8c0b176eb25d6484566ad990d15e1
|
|
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 5f25b45491 -s ours am: 62be9affe5
Change-Id: I5b2e33ca2e3b7f9edf2d1e118adadd632cfeddbd
|
|
stag-aosp-master am: 5f25b45491
Change-Id: I93d726649cfcfe44ce0a0266ba9c0ce59c3b5716
|
|
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 5f25b45491 -s ours
am skip reason: subject contains skip directive
Change-Id: I97af6d2a46f1dd2d2c5b01a1c6916636a996dbbf
|
|
Bug: 151763422
Change-Id: I1e79ed691a36790ffe44081e082552e28599940b
|
|
-s ours am: d345b53f1f -s ours am: c5ab9e3129 -s ours am: 475ddf39d5 -s ours
am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 4b3c76a71e is in history
Change-Id: Iac3aac3216b0b5d056f0522b9630dcb02a4c3e3e
|
|
-s ours am: d345b53f1f -s ours am: c5ab9e3129 -s ours
am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 4b3c76a71e is in history
Change-Id: Iee3ef0a44a1a105a52c5c34bfe5e1f1eb1ab2dd4
|
|
-s ours am: d345b53f1f -s ours
am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 4b3c76a71e is in history
Change-Id: I0c1f3147182792c89e4e5a600eaf1852bc728c39
|
|
-s ours
am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 2e466f96bc is in history
Change-Id: Ic843966341d0167591455ad01549cbda9abbef65
|
|
am: 5a59b94d97 -s ours am: e8b7a8b110 -s ours am: 8fbc662a9c -s ours
am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 4b3c76a71e is in history
Change-Id: Icac3ff28183b0f5dd37fdff3795dee12d2842ed7
|
|
am: 5a59b94d97 -s ours am: e8b7a8b110 -s ours
am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 4b3c76a71e is in history
Change-Id: I8c233fffd6ecc65aa10bcc96ef2adfb420ea6ac7
|
|
am: 5a59b94d97 am: 62a171fbb7 am: 5bc6891da7 -s ours am: 3effc4e58a -s ours
am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 2e466f96bc is in history
Change-Id: I288e1e99038d2f5fb7a2fe4a167fac772ac1f801
|
|
am: 5a59b94d97 am: 62a171fbb7 am: 5bc6891da7 -s ours
am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 2e466f96bc is in history
Change-Id: Ie9300f3ee2d7a5c95183171c0edc9b504d36af74
|
|
62a171fbb7
Change-Id: I993a8954c23642cc06dfed7bf4c8d3e82e07fe2c
|
|
Change-Id: Ib0e7fc2162c451af1532c59dd9e9257c12e9645c
|
|
am: 5a59b94d97 -s ours
am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 2e466f96bc is in history
Change-Id: Ibc23b1a2de35c5c04d7ac82128b64cb0ee543247
|
|
Change-Id: I1f4a09497944bcf9253427c24dcb8f0053a0a956
|
|
1133176ae1 am: 80e484863c am: 3d5f1ff4d5
Change-Id: Ieb4dfd69bb3bba198b22d934312de1c7aa85b5f0
|
|
1133176ae1 am: 80e484863c
Change-Id: Ia6558260c229760258469e76242a99633824a486
|
|
1133176ae1
Change-Id: Ifd216d36f11c40ab8b9f66dbe35579710ce12f1c
|
|
Change-Id: Idd284bc9c7fed822bc4f96cf42e22242a5dd532a
|
|
Change-Id: I32dc10aadf92f3061860b718f9afb63cfe9f0dc4
|
|
Change-Id: Iba6d1adaa9c1a182ecddac823bec14f32b2c8c11
|
|
Test: pass
Bug: 147696014
Change-Id: I63160745c5904597d4faf573a556ada753674b9f
Merged-In: I63160745c5904597d4faf573a556ada753674b9f
|
|
Test: pass
Bug: 147696014
Change-Id: I63160745c5904597d4faf573a556ada753674b9f
|
|
am: 652ca8938a -s ours
am skip reason: subject contains skip directive
Change-Id: I14d01d3ce51da142180a96718af07ad870037d06
|
|
Bug: 120848293
Change-Id: Ie360a56b58e71335ef1acc28af11f7fae081e7a7
|
|
MERGE am: 9eaf8f485b -s ours am: 59d8301e4d -s ours
am: 70392a8547 -s ours
Change-Id: I687d8f26a39961de73400089140aaa9a2acdfdd8
|
|
MERGE am: 9eaf8f485b -s ours
am: 59d8301e4d -s ours
Change-Id: I8bd0ea3bbd06359438e64e89ffcbc0615032d962
|
|
am: 9eaf8f485b -s ours
Change-Id: I4e39afb1df962b680893fee8b1d47fc0fe3ef588
|
|
Change-Id: Ibb6a0c3e4b887ebce0f6bbfea956fa63f23fc2b1
|