OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am...
[android-x86/packages-apps-Settings.git]
/
src
/
com
/
android
/
settings
/
ButtonBarHandler.java
2017-08-16
Suprabh Shukla
Disabling the activate button when paused am: de5df8b09...
blob
|
commitdiff
2017-07-12
Phil Weaver
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am...
blob
|
commitdiff
2017-04-12
Dmitry Dementyev
Add permission check to Intents used by Authenticator...
blob
|
commitdiff
2015-09-17
Zach Jang
am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO...
blob
|
commitdiff
2015-07-29
Sanket Padawe
am df9b13af: am 74d85949: am e05f7143: Check for specia...
blob
|
commitdiff
2015-04-01
Elliott Hughes
Merge "add Recife timezone"
blob
|
commitdiff
2015-01-29
Fyodor Kupolov
am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am...
blob
|
commitdiff
2015-01-29
Fyodor Kupolov
am d7e93570: am f11f9f47: Added a check if a custom...
blob
|
commitdiff
2015-01-29
Fyodor Kupolov
am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb...
blob
|
commitdiff
2015-01-29
Fyodor Kupolov
am 57641a8b: am d7e93570: am f11f9f47: Added a check...
blob
|
commitdiff
2014-09-11
Carlos Valdivia
am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4...
blob
|
commitdiff
2014-08-16
Baligh Uddin
am 2719eebf: (-s ours) am b3b64705: (-s ours) Import...
blob
|
commitdiff
2014-07-16
Narayan Kamath
am 2abbacb7: Merge "Get rid of duplicated code in acces...
blob
|
commitdiff
2014-07-06
Baligh Uddin
am 9bf54e70: (-s ours) am 395cf2d1: (-s ours) am 12d641...
blob
|
commitdiff
2014-07-06
Baligh Uddin
am a64a0904: (-s ours) am 5a55f567: (-s ours) Import...
blob
|
commitdiff
2014-06-26
Baligh Uddin
am 29450680: (-s ours) am eab9192a: (-s ours) Import...
blob
|
commitdiff
2014-06-18
Mark Salyzyn
am 3f7e5fc1: am ce258caa: Merge changes I8f067f14,I54d8...
blob
|
commitdiff
2014-06-18
Griff Hazen
am 3ba14771: (-s ours) am bd042089: DO NOT MERGE Fix...
blob
|
commitdiff
2014-06-13
Mark Salyzyn
resolved conflicts for merge of c2c64a31 to master
blob
|
commitdiff
2014-05-28
Brian Carlstrom
am f3542909: am 2ce0dcda: am 70f2201c: Merge "Move...
blob
|
commitdiff
2014-05-22
Baligh Uddin
am a8e1e7c9: (-s ours) am 6a0bfc9f: (-s ours) Import...
blob
|
commitdiff
2014-05-09
Jeff Sharkey
am e4dd4893: am 14f42ca9: am 110ddbfe: Merge "Fix NullP...
blob
|
commitdiff
2014-04-30
Zhihai Xu
am 3cfb6885: am d6b0b172: am 7dd84651: Merge "Display...
blob
|
commitdiff
2014-04-30
Bill Yi
am c8883585: am a3860afc: Merge commit \'36a1bbe8902534...
blob
|
commitdiff
2014-04-25
Elliott Hughes
resolved conflicts for merge of f90b5141 to master
blob
|
commitdiff
2014-04-23
Baligh Uddin
am 293b1fc0: (-s ours) am 06172af6: (-s ours) Import...
blob
|
commitdiff
2014-04-22
Christopher Tate
am a8351581: am 442f01c6: am 95228074: am c44d7c6b...
blob
|
commitdiff
2014-04-17
Baligh Uddin
am 89e96c30: (-s ours) am 54b5982f: (-s ours) Import...
blob
|
commitdiff
2014-04-16
Wink Saville
am d5b8ee9b: am 242184ca: Merge "Allow tablets to send...
blob
|
commitdiff
2014-04-16
Baligh Uddin
am ce077b41: (-s ours) am 81ff7980: (-s ours) Import...
blob
|
commitdiff
2014-04-10
Baligh Uddin
am e38487bf: (-s ours) am b6b3172c: (-s ours) am 915ef6...
blob
|
commitdiff
2014-04-10
Baligh Uddin
am 119758c9: (-s ours) am 2632b25f: (-s ours) am fba8cd...
blob
|
commitdiff
2014-04-10
Baligh Uddin
am bb58405f: (-s ours) am 8bec9dba: (-s ours) Import...
blob
|
commitdiff
2014-04-08
Baligh Uddin
am c5c89671: (-s ours) am ffa6f523: (-s ours) am f56d83...
blob
|
commitdiff
2014-04-08
Baligh Uddin
am 4193b7d1: (-s ours) am b282957b: (-s ours) am 0f2228...
blob
|
commitdiff
2014-04-08
Baligh Uddin
am 6163642d: (-s ours) am b9abc323: (-s ours) Import...
blob
|
commitdiff
2014-04-05
Xia Wang
am 70ce016f: am d2f56f07: am ac768973: am ce11881a...
blob
|
commitdiff
2014-04-04
Baligh Uddin
am 1c89073d: (-s ours) am 87132265: (-s ours) am 3f3469...
blob
|
commitdiff
2014-04-04
Baligh Uddin
am 31e51bab: (-s ours) am 44e3e56f: (-s ours) am 216b5c...
blob
|
commitdiff
2014-04-04
Baligh Uddin
am 6c87824b: (-s ours) am 457681d5: (-s ours) Merge...
blob
|
commitdiff
2014-04-03
Adrian Roos
Merge commit 'e63ac36f' into master
blob
|
commitdiff
2014-04-02
Xia Wang
am 2f633ca3: am 8361a97c: am 3e238230: am 836eff87...
blob
|
commitdiff
2014-04-01
Baligh Uddin
am b89c4d71: (-s ours) am cf743762: (-s ours) am 88adaa...
blob
|
commitdiff
2014-04-01
Baligh Uddin
am b3545a54: (-s ours) am 518a5037: (-s ours) Import...
blob
|
commitdiff
2014-03-28
John Spurlock
am ce1b22cf: (-s ours) am c4231382: DO NOT MERGE Settin...
blob
|
commitdiff
2014-03-27
Baligh Uddin
am 1df63dd8: (-s ours) am 584ac4c5: (-s ours) am f39672...
blob
|
commitdiff
2014-03-27
Baligh Uddin
am 5c5bfbb0: (-s ours) am 1dc01d10: (-s ours) Import...
blob
|
commitdiff
2014-03-25
Baligh Uddin
am ea5d0040: (-s ours) am a2ea9ac6: (-s ours) am 5f4696...
blob
|
commitdiff
2014-03-25
Baligh Uddin
am 4641bf95: (-s ours) am bbcd64cb: (-s ours) am 7bad07...
blob
|
commitdiff
2014-03-20
Baligh Uddin
am 3f114d6f: (-s ours) am 31a72b07: (-s ours) am e3a0b4...
blob
|
commitdiff
2014-03-20
Wei Wang
am 826eaa18: (-s ours) am a95228ff: am 41f5437d: DO...
blob
|
commitdiff
2014-03-17
Geoff Mendal
am 97bce9d0: (-s ours) am 26fa5188: (-s ours) am 27259b...
blob
|
commitdiff
2014-03-14
David Braun
am 177c876f: am ca95017f: am c0737638: am 63ac6a06...
blob
|
commitdiff
2014-03-14
Baligh Uddin
am c48923ed: (-s ours) am c5ff40fe: (-s ours) am 1badee...
blob
|
commitdiff
2014-03-14
Baligh Uddin
am 4323f74a: (-s ours) am 5969801c: (-s ours) am a60df0...
blob
|
commitdiff
2014-03-14
Alan Viverette
am 0fa90474: (-s ours) am 3782a3a6: am 42972075: am...
blob
|
commitdiff
2014-03-14
Alan Viverette
am 305013b1: (-s ours) am b4a50745: am c736f794: am...
blob
|
commitdiff
2014-03-13
Przemyslaw Szczepaniak
am 7a5911a9: am 375545e2: am 6829c48c: Merge "Fix F...
blob
|
commitdiff
2014-03-12
RoboErik
am 64beb278: (-s ours) am 0b71937d: am 5791cecc: b...
blob
|
commitdiff
2014-03-11
Narayan Kamath
am 677f32b1: am d4cf5c55: am c776bbb1: Merge "Revert...
blob
|
commitdiff
2014-03-08
Wei Wang
am 9075a6e2: (-s ours) am c8962d07: am 6663b245: am...
blob
|
commitdiff
2014-03-07
Rob Fletcher
am d58459cb: (-s ours) am 99fa7336: am 8ce54bd6: am...
blob
|
commitdiff
2014-02-27
Matthew Xie
am 31df7cdc: am b1140053: am 85fb88ee: Merge "HTML...
blob
|
commitdiff
2014-02-27
Narayan Kamath
am c7bcddaa: am 729c83a4: am 7f1c81b7: Merge "Revert...
blob
|
commitdiff
2014-02-27
Narayan Kamath
am a5fbf748: am ef3a0be9: am 14b0da74: Merge "Set 24...
blob
|
commitdiff
2014-02-24
Matthew Xie
am 8e6a5d31: am 27543d42: am 0223f9c5: Merge "Bluetooth...
blob
|
commitdiff
2014-02-21
Jeff Sharkey
am c3e8fd25: am e0388230: am 14136c7c: Merge "Settings...
blob
|
commitdiff
2014-02-20
Baligh Uddin
am 8db86bc9: (-s ours) am 1bb55f55: (-s ours) am a9d878...
blob
|
commitdiff
2014-02-06
Jeff Sharkey
am abe6b835: am 1f37bff7: Merge "Total and available...
blob
|
commitdiff
2014-02-06
Jeff Sharkey
am a5b5bfbb: am 5b4350f2: Merge "Fix memory leak in...
blob
|
commitdiff
2014-02-06
John Reck
Merge "Remove overdraw count option"
blob
|
commitdiff
2014-02-05
Amith Yamasani
am 8052091f: am aea431f2: am f6971ee1: am 454df35e...
blob
|
commitdiff
2014-02-04
The Android Automerger
merge in master-release history after reset to master
blob
|
commitdiff
2014-02-04
Geoff Mendal
Merge "Import translations. DO NOT MERGE"
blob
|
commitdiff
2014-02-04
Fabrice Di Meglio
Use Drawer in Settings app
blob
|
commitdiff
2011-09-14
The Android Open...
Reconcile with gingerbread-mr4-release
blob
|
commitdiff
|
diff to current
2011-09-09
Jean-Baptiste Queru
Reconcile with gingerbread-release gingerbread-mr4...
blob
|
commitdiff
|
diff to current
2011-08-30
Ryan PC Gibson
am 9fe36302: (-s ours) am 9cb97c44: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-08-12
Amith Yamasani
am d7d6c7ff: am 34d9b03f: Merge "Fix wrong behavior...
blob
|
commitdiff
|
diff to current
2011-08-12
Amith Yamasani
am b3f6116e: am fd73824d: Merge "Fix: Text is cut in...
blob
|
commitdiff
|
diff to current
2011-08-05
The Android Open...
Reconcile with gingerbread-release gingerbread-mr4...
blob
|
commitdiff
|
diff to current
2011-07-14
Dianne Hackborn
am 7d19d795: am b41b85dc: am c74500f4: Merge "Fix NPE...
blob
|
commitdiff
|
diff to current
2011-06-27
Eric Fischer
am 6a078ed3: (-s ours) am a18484fb: Import new translat...
blob
|
commitdiff
|
diff to current
2011-06-24
The Android Open...
Reconcile with gingerbread-release
blob
|
commitdiff
|
diff to current
2011-06-21
Jaikumar Ganesh
am 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-06-20
Jaikumar Ganesh
am a7bb204a: am c6f14410: Merge "Remove CHAR LIMIT...
blob
|
commitdiff
|
diff to current
2011-06-20
Jaikumar Ganesh
am f3670df2: am 2c85966d: Merge "New strings for Blueto...
blob
|
commitdiff
|
diff to current
2011-06-16
Eric Fischer
am 3c75fbc5: (-s ours) am 5bdc3e91: Import revised...
blob
|
commitdiff
|
diff to current
2011-06-09
Jean-Baptiste Queru
Reconcile with gingerbread-release
blob
|
commitdiff
|
diff to current
2011-06-07
Jaikumar Ganesh
am a6daa21d: (-s ours) am 015788ca: Merge "Import trans...
blob
|
commitdiff
|
diff to current
2011-06-07
Jaikumar Ganesh
am bd34e568: (-s ours) am eddb21a2: Merge "Changes...
blob
|
commitdiff
|
diff to current
2011-06-07
Jaikumar Ganesh
am aeca1851: (-s ours) am c955d8ee: Merge "Allow users...
blob
|
commitdiff
|
diff to current
2011-06-06
Marco Nelissen
resolved conflicts for merge of 531bed61 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-05-20
The Android Open...
Reconcile with gingerbread-release honeycomb-release
blob
|
commitdiff
|
diff to current
2011-04-28
Eric Fischer
am 643e48b7: (-s ours) am 7c284c2c: Import revised...
blob
|
commitdiff
|
diff to current
2011-04-27
Conley Owens
Ignoring empty list test in favor of commented out...
blob
|
commitdiff
|
diff to current
2011-04-12
Simon Wilson
am f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarif...
blob
|
commitdiff
|
diff to current
2011-04-11
Eric Fischer
am 84c90053: (-s ours) am fcb089c9: Merge "Reimport...
blob
|
commitdiff
|
diff to current
2011-04-11
Simon Wilson
am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-04-11
Eric Fischer
am 6735ae14: (-s ours) am b4bd78f5: Revert "Import...
blob
|
commitdiff
|
diff to current
next