OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d00ced9 9701493)
resolved conflicts for merge of 97014933 to stage-aosp-master
authorDan Albert <danalbert@google.com>
Wed, 5 Nov 2014 19:29:34 +0000 (11:29 -0800)
committerDan Albert <danalbert@google.com>
Wed, 5 Nov 2014 19:29:34 +0000 (11:29 -0800)
Change-Id: I078368a7452b8cdc67f299985c60eef90f144367


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