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:
2e6d86c
f96fff5
)
Merge "DO NOT MERGE ANYWHERE Add AOSP Geomag and Game Rotation, and Gravity" into...
author
Peng Xu
<pengxu@google.com>
Mon, 9 May 2016 13:00:06 +0000
(13:00 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 9 May 2016 13:00:06 +0000
(13:00 +0000)
am:
f96fff5015
-s ours
* commit '
f96fff5015f6823c9fde7fa603bb58ee05c5c242
':
DO NOT MERGE ANYWHERE Add AOSP Geomag and Game Rotation, and Gravity
Change-Id: I6d21d4af2974d71cbe15049424ae6f0837e1b299
Trivial merge