OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a95e7a2 9f60453)
Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a
authorJack Yu <jackyu@google.com>
Mon, 9 Jan 2017 23:11:23 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Jan 2017 23:11:23 +0000 (23:11 +0000)
am: 9f60453361  -s ours

Change-Id: I20385bd6216925de59d6ea2ac107b04e374b03b7


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