Skip to content
Commit 459d9d45 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add VERSION_CODES constant for S" am: dfe33cb7... 

[automerger skipped] Merge "Add VERSION_CODES constant for S" am: dfe33cb7 am: 230a3407 am: 60fc6b24 -s ours

am skip reason: Change-Id If5c3b92063b8d9fb3f9b6272eb2cfef448065380 with SHA-1 f2aa636c is in history

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

Change-Id: If53b57e60edb7d99352ad768b69b725f11751a20
parents 3f9c3956 60fc6b24
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