Skip to content
Commit 7692981f 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
am: a614bc99  -s ours

Change-Id: Ifd10b422b974c07db8b363dbac431f2547433161
parents 35713903 a614bc99
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