Skip to content
Commit a614bc99 authored by Cassie's avatar Cassie Committed by android-build-merger
Browse files

[automerger skipped] Merge "Move alpha long/short to the base CellIdentity... 

[automerger skipped] Merge "Move alpha long/short to the base CellIdentity according API Review." am: b57de562
am: a2a3815e  -s ours

Change-Id: I7799e0425585ed40bb6a7f27f299eb993773c50c
parents 07a91321 a2a3815e
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