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:
13f6e6c
8818423
)
NFC DTA Integration am: 276f9fe619 -s ours am: 2275fe2c53 -s ours
author
Love Khanna
<love.khanna@nxp.com>
Sat, 22 Jul 2017 00:29:02 +0000
(
00:29
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 22 Jul 2017 00:29:02 +0000
(
00:29
+0000)
am:
8818423e4e
-s ours
Change-Id: I364b07c5d7be8ec6bc58286aac4e82be6210287e
Trivial merge