OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4665be9 5cb0200)
am 5cb02008: (-s ours) am 8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 10:07:48 +0000 (10:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:07:48 +0000 (10:07 +0000)
* commit '5cb02008f9187ebcca2f24ac6d17f7ac26d1ff3e':


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