OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 162a799 35f6976)
am 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in Layou...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 01:44:30 +0000 (01:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 01:44:30 +0000 (01:44 +0000)
* commit '35f6976e10d04dd6fc6576895689b3327250cdc4':
  Include Shapes in LayoutLib. [DO NOT MERGE]


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help