OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6079aa6
661cbb7
)
Merge "DO NOT MERGE. Check and restorecon cache/code_cache directories."
author
Jeff Sharkey
<jsharkey@android.com>
Tue, 6 Dec 2016 23:44:48 +0000
(23:44 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 6 Dec 2016 23:44:48 +0000
(23:44 +0000)
am:
661cbb7f1b
-s ours
Change-Id: Iddc4eb1f1a90dda1020c4d9a7375c2b4d8dcfdc6
Trivial merge