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:
7d07319
2da8166
)
Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am: 2c2f8acdab
author
Shawn Willden
<swillden@google.com>
Wed, 15 Jun 2016 01:11:57 +0000
(
01:11
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 15 Jun 2016 01:11:57 +0000
(
01:11
+0000)
am:
2da8166a68
Change-Id: I14d955073b1093199d05ea7f4f431bc1b74f81f7
Trivial merge