tree 7de17ce9e156838e033f6bc11e02d1fbe5f515bf
parent b9efa1e5a11d1542d0bab9c945ce1e920b819764
parent db94ea9ed03dbaa0ca075a433a986d7e414e8f8d
author Deepanshu Gupta <deepanshu@google.com> 1407363950 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407363950 +0000

am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit 'db94ea9ed03dbaa0ca075a433a986d7e414e8f8d':
  Fix SystemProperties in LayoutLib.