OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a3dec0 b9e837b)
Resolve merge conflicts of b9e837bc78 to nyc-dev
authorSanket Padawe <sanketpadawe@google.com>
Mon, 29 Feb 2016 18:48:51 +0000 (10:48 -0800)
committerSanket Padawe <sanketpadawe@google.com>
Mon, 29 Feb 2016 18:48:51 +0000 (10:48 -0800)
commit7e6eec5b87ba5ba34f63f7ba99ad911d54729d87
tree04246a2c4ac9c2f2c3f949f24ab8fb71f7d6e479tree | snapshot
parent5a3dec0c401cd7c3c5bada1cc9da2a57b91fec7fcommit | diff
parentb9e837bc787bd3d5de1c6e0c3e30adb2cc25a817commit | diff
Resolve merge conflicts of b9e837bc78 to nyc-dev

+ Fix merge conflict fromm mm-wireless-dev to nyc-dev

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