OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99ac4bd 7f40420)
Merge "Fix StateMachine init/quit race." am: 5c7de22a06 am: 1ef2e98a14
authorcon <con@google.com>
Thu, 2 Nov 2017 20:37:07 +0000 (20:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Nov 2017 20:37:07 +0000 (20:37 +0000)
am: 7f404200e0  -s ours

Change-Id: I19eaca9acea75f3d9c4f8aad96f205063db24e0c


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