OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b089491) | patch
Fixing merge conflict from DR to master.
authorWinson <winsonc@google.com>
Wed, 14 Oct 2015 21:58:51 +0000 (14:58 -0700)
committerWinson <winsonc@google.com>
Wed, 14 Oct 2015 21:58:51 +0000 (14:58 -0700)
commitc89d516e094b83c52fb209aadbbf2d69ca90e17a
tree3f62559da20e421bae41916816df78ad617253adtree | snapshot
parentb08949151f8dfc7a72ea6696f2e6067c2b1643bbcommit | diff
Fixing merge conflict from DR to master.

Change-Id: Id76602204dffa2745534e8290a14e407de639c0b
packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help