OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1e83056
722550c
)
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc...
author
Chris Thornton
<thorntonc@google.com>
Mon, 12 Jun 2017 16:38:33 +0000
(16:38 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 12 Jun 2017 16:38:33 +0000
(16:38 +0000)
am:
722550cc3c
-s ours
Change-Id: Ia7ed4ded824000ecf111f4ec2886a50dea67fa76
Trivial merge