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:
4e70156
1c6eeae
)
Merge "Ensure dexopt is executed only with consistent package data" am: 1ad0304e7d
author
Calin Juravle
<calin@google.com>
Thu, 2 Nov 2017 18:34:38 +0000
(18:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 2 Nov 2017 18:34:38 +0000
(18:34 +0000)
am:
1c6eeaec1b
-s ours
Change-Id: I506470013e57b288d54eb5bc308eb79c7c224e69
Trivial merge