OSDN Git Service

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

Change-Id: If6819bb182a58a24a15bbbcfc08a4ecf3684e5e4


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