Google Git
Sign in
android / platform / external / libaom / cf5de99a83d4e8bd061338c2dd190b98df639e8c
commitcf5de99a83d4e8bd061338c2dd190b98df639e8c[log] [tgz]
authorJames Zern <jzern@google.com>Wed Oct 07 18:24:56 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Oct 07 18:24:56 2020 +0000
tree21fd52dd58de31c3b96c8f5edf3ff5feddab7eb8
parent816f15265cb89a02d7ce4b657de277828e71a4b1 [diff]
parentab5de519cbcdd6e9d6feaafaa0df49f1ced9c8b7 [diff]
[automerger skipped] resolve merge conflicts of 26957fb8e6b761837a499431d79ffcc7b4be9af4 to rvc-dev am: 4e1c2a54e6 am: ab5de519cb -s ours

am skip reason: Change-Id I558248e2a0b4cfc4bc3d7c42c80505d82fb9804f with SHA-1 816f15265c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libaom/+/12778800

Change-Id: Icc75bc07b525c66ec64936e9776c5b3c5282910a
tree: 21fd52dd58de31c3b96c8f5edf3ff5feddab7eb8
  1. config/
  2. libaom/
  3. Android.bp
  4. Android.bp.in
  5. Android.mk
  6. generate_config.sh
  7. libaom_blacklist.txt
  8. OWNERS
  9. README.android
  10. README.version
  11. update_libaom.sh