Skip to content
Commit 2523b1fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Create platformtestprotos." am: c06ebb02 am: 4ccdeba9 -s ours 

am skip reason: Merged-In I82386a6c8a5e6ddf42d8377148001f4ede2f297f with SHA-1 d61699e8 is already in history

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

Change-Id: I81c81e0c28089929262a2da203dd14cb0ca7e72a
parents 95dbd052 4ccdeba9
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