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:
67b2424
1cb4f68
)
Merge "_FILE_OFFSET_BITS=64 support for asset_manager.h." am: 47c479d9b9 am: 0f169dac29
author
Dan Albert
<danalbert@google.com>
Wed, 19 Jul 2017 05:50:01 +0000
(
05:50
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 19 Jul 2017 05:50:01 +0000
(
05:50
+0000)
am:
1cb4f68592
Change-Id: I70e186b1f6e3b4dee6901435587c991b0307a48c
Trivial merge