aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am bda36acf: (-s ours) am 10b79ba9: am 77ea9592: am 9ed99d65: am 2bc9f407: ↵Dan Zivkovic2015-03-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Block overflow menu during setup. DO NOT MERGE * commit 'bda36acf3e68ddec2dc9e0a73b057b2c647d6cb7':
| * | | am 10b79ba9: am 77ea9592: am 9ed99d65: am 2bc9f407: Block overflow menu ↵Dan Zivkovic2015-03-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | during setup. DO NOT MERGE * commit '10b79ba9afa494c5e716845b1c44e8148c7ed87f':
| | * | am 77ea9592: am 9ed99d65: am 2bc9f407: Block overflow menu during setup. DO ↵Dan Zivkovic2015-03-270-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE * commit '77ea9592b60e09fedd6c2e8b03bd12afff55ee07':
| | | * \ am 9ed99d65: am 2bc9f407: Block overflow menu during setup. DO NOT MERGEDan Zivkovic2015-03-270-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | * commit '9ed99d65f7161bab0fbc277deb63579febafb093':
| | | | * \ am 2bc9f407: Block overflow menu during setup. DO NOT MERGEDan Zivkovic2015-03-271-2/+14
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2bc9f4073d872ac3ffb56e44bef39e24da12a66f': Block overflow menu during setup. DO NOT MERGE
* | | | | \ \ Merge "Handle missing resources."Mohammadinamul Sheik2015-03-261-5/+9
|\ \ \ \ \ \ \
| * | | | | | | Handle missing resources.Dan Zivkovic2015-03-261-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for unit tests related to various bug fixes. Bug 19930761. Change-Id: I776ccccb032e3d1b181b02c6bb768500790870f7
* | | | | | | | am ec71a217: (-s ours) am 75a05460: (-s ours) am ef9b3c13: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'ec71a21787c94c0698f98316a6189d3a472bdb88':
| * | | | | | | am 75a05460: (-s ours) am ef9b3c13: (-s ours) am e397cbe2: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '75a054602c2770fa66d85d22466f20ca2cdf7694':
| | * | | | | | am ef9b3c13: (-s ours) am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge ↵Geoff Mendal2015-03-260-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'ef9b3c13231328e13981d979100063403f4c5768':
| | | * | | | | am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-03-260-0/+0
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-dev * commit 'e397cbe2dffe3c7ff81567a8992f66e34df1d495':
| | | | * | | | am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-03-260-0/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'ca58fb9c0bbe31f8d626c0c2dab39569b6a03d5a': Import translations. DO NOT MERGE
* | | | | | | | | am c634cbe1: (-s ours) am 78939d63: (-s ours) am 4172b16a: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'c634cbe14365bac44a2bb671ede6534566ac22b8':
| * | | | | | | | am 78939d63: (-s ours) am 4172b16a: (-s ours) am 92aaaa88: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '78939d63861176fbc42008fa86a2de45cad2bbf5':
| | * | | | | | | am 4172b16a: (-s ours) am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge ↵Geoff Mendal2015-03-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '4172b16afadaf00168b663464d122213f664923c':
| | | * | | | | | am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-03-260-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-dev * commit '92aaaa88d31e21ca72d24ad047195779be83bdcd':
| | | | * | | | | am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-03-260-0/+0
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '9206174e6ba94bb2b11871c983c74989684ecf4f': Import translations. DO NOT MERGE
* | | | | | | | | | am b48a6519: (-s ours) am fa18dac7: (-s ours) am 116b058b: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b48a6519cc412aae55ef8914209b09d87f801603':
| * | | | | | | | | am fa18dac7: (-s ours) am 116b058b: (-s ours) am 013b37a7: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'fa18dac7980dcf030757fcd9f0cb9774f65e7f6e':
| | * | | | | | | | am 116b058b: (-s ours) am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge ↵Geoff Mendal2015-03-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '116b058bfb410c2c3bf0c9436645c842406d99b5':
| | | * | | | | | | am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-03-260-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-dev * commit '013b37a7e91e27eb060a6a23ac607a7172f2b058':
| | | | * | | | | | am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-03-260-0/+0
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'a9431f676d472cb6b103f9d99e9c64de7d161f57': Import translations. DO NOT MERGE
* | | | | | | | | | | am 3d26af83: (-s ours) am 341f7ea7: (-s ours) am 8dc2209e: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '3d26af838690fddf9227050b18c8b03441b602c1':
| * | | | | | | | | | am 341f7ea7: (-s ours) am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '341f7ea74b30371a464994544244a8e1c0327277':
| | * | | | | | | | | am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge ↵Geoff Mendal2015-03-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '8dc2209ebf31bbb99ef1f2eb6d5c4bdf9069b4ce':
| | | * | | | | | | | am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-03-260-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-dev * commit '3a496eb86cf9db788874d1b0e4628a9c3efd1a2d':
| | | | * | | | | | | am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-03-260-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'a2fd9c6cdd094e6a076949129c01ca6d10d6fa24': Import translations. DO NOT MERGE
* | | | | | | | | | | | am b5cac103: (-s ours) am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b5cac10334ebe1640ab39039b6fbcbac818cb75a':
| * | | | | | | | | | | am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am 585f624b: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '22f10ac4016c6879f55d65b16765440ff9453f58':
| | * | | | | | | | | | am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge ↵Geoff Mendal2015-03-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '7424f8c587fb4802d4b923e9b512f66a28f24c97':
| | | * | | | | | | | | am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-03-260-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-dev * commit '585f624ba50bc34eb2661bf2f6d3e266d1a55acf':
| | | | * | | | | | | | am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-03-260-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '5bc30df7e03f9354a03d9a5f7819cd3bdae18201': Import translations. DO NOT MERGE
* | | | | | | | | | | | | am 01072c69: (-s ours) am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '01072c69f184b0a9c513bdddd0e3f2266e0abe8f':
| * | | | | | | | | | | | am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b2a45cdc1f007beb26a38b6c3fe396dfe4cab02e':
| | * | | | | | | | | | | am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge ↵Geoff Mendal2015-03-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '6b26d9d4fa6fa1e799beccbafab3278af09bf93d':
| | | * | | | | | | | | | am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-03-260-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-dev * commit '256e2ffddf7e22bdf201c44a880a36e73b8f8fbe':
| | | | * | | | | | | | | am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-03-260-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'cad0777a4bade34d6bedd096eae712e29df99fc1': Import translations. DO NOT MERGE
* | | | | | | | | | | | | | am b3cde203: (-s ours) am bbec724b: (-s ours) am 043af557: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
|\| | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE * commit 'b3cde203fd67230bbbfa1421d265bb211359905c':
| * | | | | | | | | | | | am bbec724b: (-s ours) am 043af557: (-s ours) am f4d53d6f: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31d085ff: (-s ours) Import translations. DO NOT MERGE * commit 'bbec724b2ae4677685a7300ae4b0c1e820cdf33a':
| | * | | | | | | | | | | am 043af557: (-s ours) am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import ↵Geoff Mendal2015-03-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '043af5575e549bfdc6d3f5ce3c29d9ce9fb62ea5':
| | | * | | | | | | | | | am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-260-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4d53d6fdad4335e817c6f71e730b0cf0165de0a':
| | | | * | | | | | | | | am 31d085ff: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-260-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31d085ffca82a7927f8d25f41916b09c1a6e9fbc': Import translations. DO NOT MERGE
* | | | | | | | | | | | | | Use the complete Locale in generating the dictionary id.Mohammadinamul Sheik2015-03-252-25/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also deleted a couple of dead methods. Bug:19929051 Change-Id: I4f88dbc2a8204d5e2a20d1ad8c205a23c6319f8d
* | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-2574-74/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8a29d7e960f826153ce0942fd5f4a179775377e3 Auto-generated-cl: translation import
* | | | | | | | | | | | | | Merge "Check for accounts when enabling sync features."Jatin Matani2015-03-241-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Check for accounts when enabling sync features.Jatin Matani2015-03-241-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:19895917 Change-Id: I2f2f535f5a5c17c5642a5c44d2fd20a520ccfd73
* | | | | | | | | | | | | | | Merge "Force download the dictionaries after the apk package is updated."Mohammadinamul Sheik2015-03-2410-17/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Force download the dictionaries after the apk package is updated.Mohammadinamul Sheik2015-03-2410-17/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also display the notification when the dictionaries are auto updated Bug: 19808828 Change-Id: If5c4efb73d8bb554d812afcf7deafec3ac40a462
* | | | | | | | | | | | | | | | Merge "Avoid NPE when logging the entry point to Settings"Jatin Matani2015-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Avoid NPE when logging the entry point to SettingsJatin Matani2015-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The populator class that serializes the proto uses a switch and throws an NPE. Bug:19911288 Change-Id: Id0fa371b3c64e706e14a13bb6e643406f94be035
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-08-02 00:52:53 +0000