Skip to content
Commit 3bbc581d authored by Jiyong Park's avatar Jiyong Park
Browse files

Merge remote-tracking branch 'upstream/master' into merge 

* upstream/master:
  Slice properties can be replaced

Test: TH
Change-Id: I46603fde9d5824c4a2e633b8d2c81a6b6a5d6e7d
parents 24f0b26d cecffaf0
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