OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8532049 b34cf86)
resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 13 Jun 2016 20:01:36 +0000 (13:01 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Mon, 13 Jun 2016 20:01:36 +0000 (13:01 -0700)
commit89b8babe6a7af2afbfebed80f57c1d7f39886f3d
treeb509ea81883181f2ee7f16083945a0a6fbef6c6ctree | snapshot
parent8532049946412d4fc2b75007de173d2a944e3d65commit | diff
parentb34cf8647fc1731230f47661a5337bd63b8e00d0commit | diff
resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp

Change-Id: Ie6a95224a62023a2a19054aa95382d24365124f5
src/com/android/settings/TetherSettings.java diff1 | diff2 | blob | history
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help