OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 0b54263)
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev.
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 18 Dec 2015 03:32:43 +0000 (19:32 -0800)
committerRobert Greenwalt <rgreenwalt@google.com>
Fri, 18 Dec 2015 03:32:43 +0000 (19:32 -0800)
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0


No differences found
frameworks/base
About OSDN
Find Software
Develop Software
Help