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:
79ebcde
b0d92f4
)
Merge "Fix @code escapes"
author
Neil Fuller
<nfuller@google.com>
Fri, 15 Jan 2016 16:31:40 +0000
(16:31 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 15 Jan 2016 16:31:40 +0000
(16:31 +0000)
am:
b0d92f4717
* commit '
b0d92f4717af4e4736dc80b2a822dae8e5a52587
':
Fix @code escapes
1
2
core/java/android/hardware/Camera.java
patch
|
diff1
|
diff2
|
blob
|
history
core/res/AndroidManifest.xml
patch
|
diff1
|
diff2
|
blob
|
history
docs/html/guide/topics/manifest/uses-feature-element.jd
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/hardware/Camera.java
Simple merge
diff --cc
core/res/AndroidManifest.xml
Simple merge
diff --cc
docs/html/guide/topics/manifest/uses-feature-element.jd
Simple merge