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

Commit fdbb9fd4 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 5cf79292: (-s ours) Reconcile with jb-mr1-release - do not merge 

* commit '5cf79292':
  JOO86
  JOO85B
  JOO85
  JOO84
  JOO83C
  Include videoeditor_jni in sdk product build.
  JOO83B
  JOO83
  fix PDK build
  Use prebuilt for PDK builds.
  JOO82C
  JOO82B
parents 9394498a 5cf79292
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment