OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d51b235 fdaac48)
resolve merge conflicts of 9d47cae to nyc-docs am: d5cabb92bc
authorsreevanis <sreevanis@google.com>
Thu, 4 Aug 2016 02:38:44 +0000 (02:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Aug 2016 02:38:44 +0000 (02:38 +0000)
am: fdaac48e99

Change-Id: I8a1aa4000efa91d07d2d90dc8dd8938b30aed919


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