OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8888f02 f5a2fbc)
Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0
authorSreevani Sreejith <sreevanis@google.com>
Thu, 4 Aug 2016 02:38:47 +0000 (02:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Aug 2016 02:38:47 +0000 (02:38 +0000)
am: f5a2fbc156

Change-Id: I37eb8462dcf65783d64c71336ee0d7fc8a354c4e


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