tree 34b6eab1f556204667aa53d6d91950faf9a5917b
parent f2c5a9ee4944b5ca995d0c6b11ccaddecf6432e1
parent ba31d628621f3d49195d141dabff30a7665f3b50
author Deepanshu Gupta <deepanshu@google.com> 1407364206 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407364206 +0000

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

* commit 'ba31d628621f3d49195d141dabff30a7665f3b50':
  Fix SystemProperties in LayoutLib.