Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 031de969 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 14" into main

parents 2bcc7900 ae461709

.clang-format

+12 −0
Original line number Diff line number Diff line
@@ -9,5 +9,17 @@ CommentPragmas: NOLINT:.* 
ConstructorInitializerIndentWidth: 6

ContinuationIndentWidth: 8

IndentWidth: 4

JavaImportGroups:

- android

- androidx

- com.android

- dalvik

- libcore

- com

- junit

- net

- org

- java

- javax

PenaltyBreakBeforeFirstCallParameter: 100000

SpacesBeforeTrailingComments: 1

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShimPriv_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "9653376"

    build_id: "10093150"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShimPriv.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "master"

  git_branch: "udc-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShim_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "9653376"

    build_id: "10093150"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShim.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "master"

  git_branch: "udc-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShimPriv_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "9653376"

    build_id: "10093150"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShimPriv.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "master"

  git_branch: "udc-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShim_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "9653376"

    build_id: "10093150"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShim.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "master"

  git_branch: "udc-dev"

  transform: TRANSFORM_NONE

  transform_options {

  }