OSDN Git Service

am 6ebeefa0: am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 6 Aug 2014 22:59:08 +0000 (22:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 6 Aug 2014 22:59:08 +0000 (22:59 +0000)
commit4e01c59e6c0d953c40153afc080c01d844f76aef
tree5dc25242eb0de9cf872521f97279299c342fd1d7
parentc08203c22c8407d9a9777eb6f436bfb79edb1f74
parent6ebeefa04cb3c360d8028eb77e60bacf8a800cb1
am 6ebeefa0: am 904d7711: am 7b561be3: am 09c3c2ed: 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 '6ebeefa04cb3c360d8028eb77e60bacf8a800cb1':
  Fix SystemProperties in LayoutLib.