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 in master-release history after reset to master
[android-x86/packages-apps-Settings.git]
/
Android.mk
2013-08-03
Dianne Hackborn
am ad38b60b: am 0a09b13c: am a6683e0f: Reset app prefer...
blob
|
commitdiff
2013-08-03
Dianne Hackborn
am 0a09b13c: am a6683e0f: Reset app preferences now...
blob
|
commitdiff
|
diff to current
2013-08-03
Jean-Baptiste Queru
am a43e2701: (-s ours) am 4dce3456: am 034b83e8: Reconc...
blob
|
commitdiff
2013-08-03
Jean-Baptiste Queru
am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2...
blob
|
commitdiff
|
diff to current
2013-08-02
Dianne Hackborn
am 45d4dce2: (-s ours) am ca1b7458: Completely remove...
blob
|
commitdiff
2013-08-02
Baligh Uddin
Merge commit '0b849a70'
blob
|
commitdiff
2013-08-02
Dave Burke
am 1a32d477: am 136059f1: Merge "Revert "Completely...
blob
|
commitdiff
|
diff to current
2013-08-01
Baligh Uddin
Merge commit '99d5938c'
blob
|
commitdiff
2013-08-01
Sascha Prueter
am df195650: am d346fce2: Merge "Completely remove...
blob
|
commitdiff
|
diff to current
2013-07-30
Baligh Uddin
am 781458b3: (-s ours) am bdf28a18: (-s ours) am 0cb570...
blob
|
commitdiff
2013-07-30
Baligh Uddin
am 539552e1: (-s ours) am 3ddbe519: (-s ours) Import...
blob
|
commitdiff
2013-07-30
Baligh Uddin
am bdf28a18: (-s ours) am 0cb57011: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2013-07-30
Baligh Uddin
am 3ddbe519: (-s ours) Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2013-07-29
Robert Greenwalt
am 5b7bf112: am 35a2d796: Merge "Fix "Add Network"...
blob
|
commitdiff
2013-07-25
Baligh Uddin
am 1d690c8a: (-s ours) am 92ce2809: am 542960fb: Import...
blob
|
commitdiff
2013-07-25
Baligh Uddin
am 92ce2809: am 542960fb: Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2013-07-25
Baligh Uddin
am 110a58ff: (-s ours) am 693abd31: Import translations...
blob
|
commitdiff
2013-07-25
Baligh Uddin
am 693abd31: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-07-23
Baligh Uddin
am 82c51535: (-s ours) am 0d8bde94: am 6b939fe2: Import...
blob
|
commitdiff
2013-07-23
Baligh Uddin
am 7d77f1ac: (-s ours) am dd00b6b0: Import translations...
blob
|
commitdiff
2013-07-23
Baligh Uddin
am 0d8bde94: am 6b939fe2: Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2013-07-23
Baligh Uddin
am dd00b6b0: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-07-19
Baligh Uddin
am 50212d6c: (-s ours) am a4a2194a: am 68b87505: Import...
blob
|
commitdiff
2013-07-19
Baligh Uddin
am 8d9e3eb0: (-s ours) am 8180a3a8: Merge "Import trans...
blob
|
commitdiff
2013-07-19
The Android Open...
am 58311f90: (-s ours) Reconcile with jb-mr2-zeroday...
blob
|
commitdiff
2013-07-19
Robert Greenwalt
am ea6b5d63: am 275c1dff: am 3c087a68: Merge "Use Conne...
blob
|
commitdiff
2013-07-19
Baligh Uddin
am a4a2194a: am 68b87505: Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2013-07-19
Baligh Uddin
am 8180a3a8: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2013-07-19
The Android Open...
Reconcile with jb-mr2-zeroday-release - do not merge
blob
|
commitdiff
|
diff to current
2013-07-19
Robert Greenwalt
am 275c1dff: am 3c087a68: Merge "Use ConnectivityManage...
blob
|
commitdiff
|
diff to current
2013-07-19
Robert Greenwalt
am ba32c249: resolved conflicts for merge of 4d9f670b...
blob
|
commitdiff
2013-07-19
Robert Greenwalt
resolved conflicts for merge of 4d9f670b to stage-aosp...
blob
|
commitdiff
|
diff to current
2013-07-16
Baligh Uddin
am f6d197a7: (-s ours) am 613cab12: am f9d69170: Import...
blob
|
commitdiff
2013-07-16
Baligh Uddin
am 613cab12: am f9d69170: Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2013-07-16
Baligh Uddin
am 48fa42b5: (-s ours) am 3f573fae: Import translations...
blob
|
commitdiff
2013-07-16
Baligh Uddin
am 3f573fae: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-07-15
The Android Open...
am f2d9e68c: (-s ours) Reconcile with jb-mr2-zeroday...
blob
|
commitdiff
2013-07-15
The Android Open...
Reconcile with jb-mr2-zeroday-release - do not merge
blob
|
commitdiff
|
diff to current
2013-07-12
Wink Saville
am eeb90735: am 95c2a4a4: am 80bfbd53: Merge "VZW wants...
blob
|
commitdiff
2013-07-12
Wink Saville
am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNum...
blob
|
commitdiff
|
diff to current
2013-07-11
Baligh Uddin
am 9d41a551: (-s ours) am 5ecc395e: Merge "Import trans...
blob
|
commitdiff
2013-07-11
Baligh Uddin
am 5ecc395e: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2013-07-11
Baligh Uddin
am db4cfb0c: (-s ours) am 9598002a: am 2a1ccab1: Import...
blob
|
commitdiff
2013-07-11
Baligh Uddin
am 9598002a: am 2a1ccab1: Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2013-07-11
The Android Open...
am eddcf88e: (-s ours) Reconcile with jb-mr2-zeroday...
blob
|
commitdiff
2013-07-09
The Android Open...
Reconcile with jb-mr2-zeroday-release - do not merge
blob
|
commitdiff
|
diff to current
2013-07-08
The Android Open...
am ff2b0d7f: (-s ours) Reconcile with jb-mr2-zeroday...
blob
|
commitdiff
2013-07-08
The Android Open...
Reconcile with jb-mr2-zeroday-release - do not merge
blob
|
commitdiff
|
diff to current
2013-07-08
Baligh Uddin
am 18119223: (-s ours) am 55077df1: am f1d02056: Import...
blob
|
commitdiff
2013-07-08
Baligh Uddin
am 369ca5a7: (-s ours) am 20a554fa: Import translations...
blob
|
commitdiff
2013-07-08
Baligh Uddin
am 55077df1: am f1d02056: Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2013-07-08
Baligh Uddin
am 20a554fa: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-07-03
The Android Open...
am d8e00a0b: (-s ours) Reconcile with jb-mr2-zeroday...
blob
|
commitdiff
2013-07-03
The Android Open...
Reconcile with jb-mr2-zeroday-release - do not merge
blob
|
commitdiff
|
diff to current
2013-07-03
Baligh Uddin
am 143d4600: (-s ours) am 8bd9f2f2: am 76185f72: Import...
blob
|
commitdiff
2013-07-03
Baligh Uddin
am 7f49b198: (-s ours) am df0ad0dc: am aa03b2f6: (...
blob
|
commitdiff
2013-07-03
Baligh Uddin
am 8bd9f2f2: am 76185f72: Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2013-07-03
Baligh Uddin
am df0ad0dc: am aa03b2f6: (-s ours) Merge "Import trans...
blob
|
commitdiff
|
diff to current
2013-07-03
Baligh Uddin
am 8db7a8c5: (-s ours) am ad965c17: Import translations...
blob
|
commitdiff
2013-07-03
Baligh Uddin
am ad965c17: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2013-07-02
Baligh Uddin
am daa0e5ab: (-s ours) am e462f0d5: Merge "Import trans...
blob
|
commitdiff
2013-07-02
Baligh Uddin
am e462f0d5: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2013-07-02
Wink Saville
am 17f1fa42: am 7319f2b1: am 5d5a269f: Add Manage mobil...
blob
|
commitdiff
2013-07-01
Wink Saville
am 7319f2b1: am 5d5a269f: Add Manage mobile plan to...
blob
|
commitdiff
|
diff to current
2013-07-01
The Android Open...
am 6ab277ee: (-s ours) Reconcile with jb-mr2-zeroday...
blob
|
commitdiff
2013-07-01
The Android Open...
Reconcile with jb-mr2-zeroday-release - do not merge
blob
|
commitdiff
|
diff to current
2013-06-28
Robert Greenwalt
am 50702355: am 5d3ef571: am a1454529: Merge "Dont...
blob
|
commitdiff
2013-06-28
Robert Greenwalt
am a1454529: Merge "Dont enable Wi-Fi if it\'s not...
blob
|
commitdiff
|
diff to current
2013-06-27
Elliott Hughes
am 29bed78d: am add37ef4: am 5f6e4339: Merge "Use Simpl...
blob
|
commitdiff
2013-06-27
Elliott Hughes
am 5f6e4339: Merge "Use SimpleDateFormat for time zone...
blob
|
commitdiff
|
diff to current
2013-06-27
Amith Yamasani
am 9495b2f9: am 51d2ff75: am bf87f7d7: Fix inconsistent...
blob
|
commitdiff
2013-06-27
Amith Yamasani
am 51d2ff75: am bf87f7d7: Fix inconsistent string
blob
|
commitdiff
|
diff to current
2013-06-26
The Android Open...
am 42dc6df1: (-s ours) Reconcile with jb-mr2-zeroday...
blob
|
commitdiff
2013-06-25
Elliott Hughes
am 2295035a: am b17fef80: am 02e23fb0: Merge "Clamp...
blob
|
commitdiff
2013-06-25
The Android Open...
Reconcile with jb-mr2-zeroday-release - do not merge
blob
|
commitdiff
|
diff to current
2013-06-25
Russell Brenner
Merge "Setup fontsize change"
blob
|
commitdiff
2013-06-25
Elliott Hughes
am 02e23fb0: Merge "Clamp date setting for the SetupWiz...
blob
|
commitdiff
|
diff to current
2013-06-21
The Android Open...
am 11f5f984: (-s ours) Reconcile with jb-mr2-zeroday...
blob
|
commitdiff
2013-06-21
The Android Open...
Reconcile with jb-mr2-zeroday-release - do not merge
blob
|
commitdiff
|
diff to current
2013-06-20
Dianne Hackborn
am 7f74dea7: am 67571084: am 5da4c907: Merge "Fix issue...
blob
|
commitdiff
2013-06-20
Dianne Hackborn
am 67571084: am 5da4c907: Merge "Fix issue #9486022...
blob
|
commitdiff
|
diff to current
2013-06-20
Baligh Uddin
am 793ed6e0: (-s ours) am 178baecf: Merge "Import trans...
blob
|
commitdiff
2013-06-20
Baligh Uddin
am 178baecf: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2013-06-20
Baligh Uddin
am 86d2f720: (-s ours) am e0878e35: am 80a0d9a3: Import...
blob
|
commitdiff
2013-06-20
Baligh Uddin
am e0878e35: am 80a0d9a3: Import translations. DO NOT...
blob
|
commitdiff
|
diff to current
2013-06-20
The Android Open...
am 9b78ee91: (-s ours) Reconcile with jb-mr2-release...
blob
|
commitdiff
2013-06-20
The Android Open...
Reconcile with jb-mr2-release - do not merge
blob
|
commitdiff
|
diff to current
2013-06-18
The Android Automerger
merge in master-release history after reset to master
blob
|
commitdiff
2013-06-17
Christopher Tate
Merge "The Settings app needs privileged permissions"
blob
|
commitdiff
2013-06-17
Baligh Uddin
am 94496184: (-s ours) am 7a42c809: Merge "Import trans...
blob
|
commitdiff
|
diff to current
2013-06-17
Baligh Uddin
am 7a42c809: Merge "Import translations. DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2013-06-17
Christopher Tate
The Settings app needs privileged permissions
blob
|
commitdiff
2013-06-17
Baligh Uddin
am 44789f92: (-s ours) am f7c2889c: am 7f37c30b: (...
blob
|
commitdiff
|
diff to current
2013-06-17
Baligh Uddin
am f7c2889c: am 7f37c30b: (-s ours) Import translations...
blob
|
commitdiff
|
diff to current
2013-06-13
The Android Open...
am bb3a943d: (-s ours) Reconcile with jb-mr2-zeroday...
blob
|
commitdiff
|
diff to current
2013-06-13
The Android Open...
Reconcile with jb-mr2-zeroday-release - do not merge
blob
|
commitdiff
|
diff to current
2013-06-13
The Android Open...
am a5520e76: (-s ours) Reconcile with jb-mr2-release...
blob
|
commitdiff
|
diff to current
2013-06-13
The Android Open...
Reconcile with jb-mr2-release - do not merge
blob
|
commitdiff
|
diff to current
2013-06-12
Baligh Uddin
am b45bac74: (-s ours) am 0117cc7c: Import translations...
blob
|
commitdiff
|
diff to current
2013-06-12
Baligh Uddin
am 0117cc7c: Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
next