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:
ceb190e
14287c8
)
Merge "TIF: Put comments for the newly added US and Canadian rating strings"
author
Jae Seo
<jaeseo@google.com>
Wed, 29 Apr 2015 02:57:23 +0000
(
02:57
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 29 Apr 2015 02:57:27 +0000
(
02:57
+0000)
1
2
media/java/android/media/tv/TvContentRating.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/java/android/media/tv/TvContentRating.java
Simple merge