OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d167a27 5036611)
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmal...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:36:11 +0000 (20:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:36:11 +0000 (20:36 +0000)
am: 503661118a  -s ours

Change-Id: I1dc24f01552359d8cdaea875f399878fa55ea2e0


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