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:
ed32594
366c38f
)
am 366c38f8: Merge "Enable atrace to read categories from file."
author
Yasuhiro Matsuda
<mazda@google.com>
Thu, 30 Jul 2015 07:51:08 +0000
(07:51 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 30 Jul 2015 07:51:08 +0000
(07:51 +0000)
* commit '
366c38f82393c8a3e9419c0dbe6320504a4d741b
':
Enable atrace to read categories from file.
Trivial merge