OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9212fc7 f4fba91)
[DO NOT MERGE] Only setSize if -s arg is specified am: b87a491de6 am: 7c9a91094d...
authorFyodor Kupolov <fkupolov@google.com>
Fri, 28 Oct 2016 00:48:18 +0000 (00:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Oct 2016 00:48:18 +0000 (00:48 +0000)
am: f4fba91b5f  -s ours

Change-Id: Id759489caebf38b93bda790e8d36827d6635aac4


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