OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc94c31 05160d7)
resolve merge conflicts of 5152fd9 to stage-aosp-master
authorChih-hung Hsieh <chh@google.com>
Fri, 22 Jul 2016 01:53:29 +0000 (01:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 01:53:29 +0000 (01:53 +0000)
am: 05160d70d1

Change-Id: Id1d734fd162d6063fdc818afc68f09809f764c5f


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