Skip to content
Commit 72cf03a2 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs 

* commit '3a544a81':
  Fix SystemProperties in LayoutLib.
parents 8c71ff29 3a544a81
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