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

Skip to content
Commit d10d8981 authored by Makoto Onuki's avatar Makoto Onuki Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Don't add API annotations in the internal R.java"... 

[automerger skipped] Merge "Don't add API annotations in the internal R.java" am: 0ad81868 am: e7105c39 -s ours

am skip reason: Change-Id I613e8611ddaf5f8e4761d351d4cd0142d59c7cc9 with SHA-1 de6e6f20 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1347423

Change-Id: I3f584160d4cbd77ae93ca898161b8bd8da8c1a53
parents a05d793f e7105c39
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment