OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c86c1f f838b76)
resolved conflicts for merge of f838b76f to master
authorDmitriy Ivanov <dimitry@google.com>
Tue, 7 Apr 2015 18:17:19 +0000 (11:17 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Tue, 7 Apr 2015 18:17:19 +0000 (11:17 -0700)
Change-Id: I2ee8f2cc15f16b1e98112955d196dba96c38ef20


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help