OSDN Git Service

am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 6 Aug 2014 22:18:04 +0000 (22:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 6 Aug 2014 22:18:04 +0000 (22:18 +0000)
commitf970d2c201649843b8d51d094b865f16b15bc0bc
tree75615ab15cbbba19cfe1e23ec5554cf9c3b0e08f
parentc735197420948ffff757dbe6d00028a87ed09c15
parent79c3f678d21f6b3c058623217cbe5dd57a553fe8
am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs

* commit '79c3f678d21f6b3c058623217cbe5dd57a553fe8':
  Fix SystemProperties in LayoutLib.