OSDN Git Service

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


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