OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 741757f 9d47cae)
resolve merge conflicts of 9d47cae to nyc-docs
authorsreevanis <sreevanis@google.com>
Wed, 3 Aug 2016 21:47:58 +0000 (14:47 -0700)
committersreevanis <sreevanis@google.com>
Wed, 3 Aug 2016 21:47:58 +0000 (14:47 -0700)
Change-Id: I737539c2bdaca60ac1dac3ca5ecb815c9bd440ab


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