OSDN Git Service

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

Change-Id: I7d5ac6aff948f6ff8677e54d159eed17e0d2a9a5


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