OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33b0f43 3130b4e)
Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86 -s ours
authorDan Willemsen <dwillemsen@google.com>
Fri, 20 Oct 2017 18:36:10 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 18:36:10 +0000 (18:36 +0000)
am: 3130b4e146  -s ours

Change-Id: I8c22645a4148dcbc80f30b6d54ccd4926d4194c1


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