summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-devBadhri Jagan Sridharan2015-09-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Include init.usb.configfs.rc into rootdirBadhri Jagan Sridharan2015-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug=23633457 Change-Id: I26bbc5ff597138b2ccac1de72117753739b31554
* | | | | | | | | | | | Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-devTao Bao2015-09-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revert "Temporarily use blockimgdiff v2 for OTA."Tao Bao2015-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d07bfc519673fdba66448f0a81ef869b922c3804. Real fixes [1][2][3] are ready to merge. Time to revert the workaround. [1] commit d47d8e14880132c42a75f41c8041851797c75e35 [2] commit 1fc67631eedbfba07e005d85aadae6e1b91d8d93 [3] commit 937847ae493d36b9741f6387a2357d5cdceda3d9 Bug: 22430577 Change-Id: Icd6623e8717c93ad1f12cd1ba43db5e006e928ad
* | | | | | | | | | | | | am 4ffdc8fa: Fix bug that caused table of Studio links to result in ↵smain@google.com2015-08-311-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "stand-alone" tools instructions. bug: 23570662 * commit '4ffdc8faf2c795027f38b6ef4685dd6d1179878e': Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
| * | | | | | | | | | | | Fix bug that caused table of Studio links to result in "stand-alone" tools ↵smain@google.com2015-08-281-6/+10
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instructions. bug: 23570662 Change-Id: I7482eddbeffa581307bf7f76b9653de41966b6f9
* | | | | | | | | | | | Merge changes from topic 'stash-size' into mnc-dr-devTao Bao2015-08-313-18/+213
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Split large files for BBOTA v3. Revise stash for BBOTAs when needed. Assert the stash size when generating OTAs.
| * | | | | | | | | | | Split large files for BBOTA v3.Tao Bao2015-08-262-17/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For BBOTA v3, we need to stash source blocks to support resumable feature. However, with the growth of file size and the shrink of the cache size, source blocks that represent a file are too large to be stashed as a whole. CL in [1] solves the issue by replacing the diff command with a "new" command. However, it may increase the generated package size substantially (e.g. from ~100MB to ~400MB). With this CL, if a file spans too many blocks, we split it into smaller pieces by generating multiple commands. For the same case above, it reduces the package size to ~150MB. One potential downside is that after splitting, files like .jar, .apk and .zip can no longer use imgdiff. We may lose the potential benefit of using imgdiff for patch size reduction. [1] commit 82c47981bd0602a1c7b50dfabf9a6a2412993bae Bug: 22430577 Change-Id: Iee1ad6543f3d40368e079e418cc31728e1ab3f48 (cherry picked from commit 9a5caf2c30e5dcb19823dff328de1cfb140a2799)
| * | | | | | | | | | | Revise stash for BBOTAs when needed.Tao Bao2015-08-261-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating incremental BBOTAs (v2 and above), we need to ensure that the needed runtime stash is below the given threshold. If it's running out of space on /cache, we replace the command that uses a stash with a "new" command instead. This may increase the OTA package size, since it is carrying more full blocks instead of patches. It gets even worse for large files that span a number of blocks, because currently we will store all the blocks for the file as "new" blocks if stashing cannot be satisfied. We may further optimize by splitting them into smaller chunks so that most of them can still be stashed. Bug: 22430577 Change-Id: Ieae5243d461e3f899f613f76a380f6f7c3edb356 (cherry picked from commit 82c47981bd0602a1c7b50dfabf9a6a2412993bae)
| * | | | | | | | | | | Assert the stash size when generating OTAs.Tao Bao2015-08-262-5/+39
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With block-based OTA v2 and v3, it requires stash space on the /cache partition to back up blocks during an update. We need to ensure that it doesn't exceed the partition size. Since there might be other files on /cache as well, we use cache_size * threshold as the maximum allowed size. The threshold defaults to 0.8, which can be overridden by command line option '--stash_threshold'. Change-Id: Ieee5d373c9bfb2ea401d85ca8a3adb491579de76 (cherry picked from commit 23ac4042128e47f6fe1ef176e7cb96f907d8e149)
* | | | | | | | | | | am 4fc14679: am fc168f84: resolved conflicts for merge of 1a8c6567 to ↵Ying Wang2015-08-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-ub-dev * commit '4fc1467949aaf9e6a49a6771ed996e3c2c702314': Don't fail build of otatools if there are no device certificates
| * | | | | | | | | | am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-devYing Wang2015-08-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc168f84695f492f2ad0eed3063145f425bebf45': Don't fail build of otatools if there are no device certificates
| | * | | | | | | | | resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-devYing Wang2015-08-260-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b
| | | * | | | | | | | am 8d771971: Don\'t fail build of otatools if there are no device certificatesClaes Elgemark2015-08-261-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8d771971212069f77851163f437c782f581bf6db': Don't fail build of otatools if there are no device certificates
| | | | * | | | | | | Don't fail build of otatools if there are no device certificatesClaes Elgemark2015-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23552169 Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
* | | | | | | | | | | am 8f7c08ed: am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package.Ying Wang2015-08-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | | * commit '8f7c08ed622d733c0997324d5b0464ba7e57c1fa': Dist the otatools package.
| * | | | | | | | | am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package.Ying Wang2015-08-271-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1e120181f0a9240eca61dface4fb4530bf2594ab': Dist the otatools package.
| | * | | | | | | | am 473b6a5f: am fc028e59: Dist the otatools package.Ying Wang2015-08-261-0/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '473b6a5f2b00f941acb08b5c3df59cbbdf647609': Dist the otatools package.
| | | * | | | | | | am fc028e59: Dist the otatools package.Ying Wang2015-08-251-0/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd': Dist the otatools package.
| | | | * | | | | | Dist the otatools package.Ying Wang2015-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23495952 (cherry picked from commit 267e957373765ad1e3ce89abe61886a305277027) Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
* | | | | | | | | | am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-devBart Sears2015-08-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c69aa42b4331569814d23336412e6754a0495d65': Set the Security Patch level for MNC
| * | | | | | | | | Merge "Set the Security Patch level for MNC" into mnc-devBart Sears2015-08-261-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Set the Security Patch level for MNCBart Sears2015-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MNC will include the security patches from the August OEM bulletin which will have a patch date of September 1. Bug: 23288951 Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
* | | | | | | | | | | am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to ↵Tao Bao2015-08-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-ub-dev * commit 'afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825': add otatools-package target
| * | | | | | | | | | am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-devTao Bao2015-08-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6e087adc420ca08bfea8613c07aa51e1b4a2e3e': add otatools-package target
| | * | | | | | | | | resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-devTao Bao2015-08-250-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | Change-Id: Ia53581aee207b0a24807767d7e80959a4fc9aff3
| | | * | | | | | | | am 32bf3f32: add otatools-package targetDoug Zongker2015-08-251-0/+24
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '32bf3f32651ddff9ffa2168017d71ec4b151a0a9': add otatools-package target
| | | | * | | | | | | add otatools-package targetDoug Zongker2015-08-241-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a target to zip up all the otatools and releasetools, for easy copying to the OTA builder machine. Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563 (cherry picked from commit f22b0f43efbc16c548692dc239a387edda15d78f)
* | | | | | | | | | | am ca19158e: am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 ↵Konstantinos Menychtas2015-08-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to lmp-mr1-ub-dev * commit 'ca19158e034d6e0f5a605698c0f303893a2b9248': Increasing all emulator system image sizes
| * | | | | | | | | | am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to ↵Konstantinos Menychtas2015-08-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | / / / / / / | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-ub-dev * commit 'e9a8f465859137ba37786031b804864205900cb4': Increasing all emulator system image sizes
| | * | | | | | | | resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-devKonstantinos Menychtas2015-08-255-5/+5
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5
| | | * | | | | | | am dae79613: Increasing all emulator system image sizesKonstantinos Menychtas2015-08-186-6/+6
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dae79613cb4deb209d3428b108535715aa364f68': Increasing all emulator system image sizes
| | | | * | | | | | Increasing all emulator system image sizesKonstantinos Menychtas2015-08-186-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Size increase in system image deemed necessary after build breakage observed on lmp-mr1-dev due to lack of space on MIPS system image. All system image sizes updated to match the image size values set in MNC-dev (avoid merge conflicts, future-proof all images against similar breakage issues). This image size increase takes moderate space on host device and does not affect system image download size (images are sparse but delivered compressed anyway). Change-Id: I2bdeb10f2d98030a358a9bc4249ce23c432de5bd
* | | | | | | | | | am ed7e864a: fix a few bugs in the studio download button behavior: - make ↵smain@google.com2015-08-242-5/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation scr * commit 'ed7e864a735f004f1dbb4a2db5261855b5693913': fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation script when clicking download before agree because it reloaded the page (unkown cause) depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
| * | | | | | | | | fix a few bugs in the studio download button behavior:smain@google.com2015-08-202-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation script when clicking download before agree because it reloaded the page (unkown cause) depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/ Change-Id: I1b2b4ff9c0b0cbbd34f1c77a2b736fe3425a16e4
* | | | | | | | | | am 956e4693: Increasing MIPS emulator system image size and user-data image sizeKonstantinos Menychtas2015-08-181-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '956e469327b1da4b635f20795ed48f6c36ba10d6': Increasing MIPS emulator system image size and user-data image size
| * | | | | | | | | Increasing MIPS emulator system image size and user-data image sizeKonstantinos Menychtas2015-08-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Size increase taken as a precaution against recent built breakage due to lack of space on a number of targets (e.g. x86, ARM64). System and user-data image sizes set to match currently most common setup for the emulator: system image: 1.25gb, user-data image 700mb. Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
* | | | | | | | | | am 6a8f88cd: adjust image placement for m hero on medium screens.Dirk Dougherty2015-08-161-1/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a8f88cdec931470256ade35ffe6b8097425e36f': adjust image placement for m hero on medium screens.
| * | | | | | | | | adjust image placement for m hero on medium screens.Dirk Dougherty2015-08-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I644837bf151549ad8dbbfb194f8e699233362933
* | | | | | | | | | am 71e0a80c: Merge "doc change: Add hero image for m and css for landing ↵Joe Fernandez2015-08-132-0/+66
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pages." into mnc-dev * commit '71e0a80c2c2fdc26bb014685eebb874aa40f782d': doc change: Add hero image for m and css for landing pages.
| * | | | | | | | | Merge "doc change: Add hero image for m and css for landing pages." into mnc-devJoe Fernandez2015-08-132-0/+66
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | doc change: Add hero image for m and css for landing pages.Dirk Dougherty2015-08-132-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I52ddba716eebf821f8f5dbd888d6e3519f4284d4
* | | | | | | | | | | am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the ↵Chris Banes2015-08-131-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs" into mnc-dev * commit '743938fb0d4f56d7d009486fb90891eab9b50897': Make sure only AppCompat (not it's tests) are in the docs
| * | | | | | | | | | Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-devChris Banes2015-08-131-1/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Make sure only AppCompat (not it's tests) are in the docsChris Banes2015-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 23169683 Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
* | | | | | | | | | | | am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony ↵Mike Dodd2015-08-132-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builds." into mnc-dev * commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d': Include new AOSP messaging app in base AOSP telephony builds.
| * | | | | | | | | | | Merge "Include new AOSP messaging app in base AOSP telephony builds." into ↵Mike Dodd2015-08-132-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | mnc-dev
| | * | | | | | | | | | Include new AOSP messaging app in base AOSP telephony builds.Mike Dodd2015-08-122-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/23110861 Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
* | | | | | | | | | | | am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in ↵Dianne Hackborn2015-08-134-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings" into mnc-dev * commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c': Fix issie #23116383: Include security patch level in Settings
| * | | | | | | | | | | Merge "Fix issie #23116383: Include security patch level in Settings" into ↵Dianne Hackborn2015-08-134-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | mnc-dev
generated by cgit v1.1 at 2025-01-11 06:12:22 +0000