OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cbec336 ffe502b)
resolve merge conflicts of ffe502b to cw-f-dev
authorAndy Hung <hunga@google.com>
Tue, 18 Oct 2016 18:55:04 +0000 (11:55 -0700)
committerAndy Hung <hunga@google.com>
Tue, 18 Oct 2016 18:55:04 +0000 (11:55 -0700)
commit3dd656c624f93cac5c0035c6a5ee1171a1be24eb
tree082dce65eebe2357875bca344f07932a74997056tree | snapshot
parentcbec33614a34d2e6d9920fe3fc82d6fac2e1e529commit | diff
parentffe502bd61ebe78c2f580c1486021dc116a08f94commit | diff
resolve merge conflicts of ffe502b to cw-f-dev

Change-Id: Id392b2e1990dc50b5d2d552f283a11a648d849a1
media/java/android/media/Ringtone.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help