OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b99a507 e843936)
Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev
authorAlan Viverette <alanv@google.com>
Thu, 21 Apr 2016 21:27:03 +0000 (21:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 21:27:03 +0000 (21:27 +0000)
am: e84393674d

* commit 'e84393674da0f5ecce2ee1074fc79c856f549623':
  Don't overwrite vertical and horizontal offsets unless explicit

Change-Id: I9cd87f63c07748ba4d53b1e8326900c1efeb04ee


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