Geoff Mendal
c5378ab518
am 2c636248: (-s ours) am e618963b: (-s ours) am 035e10f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '2c636248dd7e62c4f17c304df08eb73652d788fa':
Import translations. DO NOT MERGE
2015-08-08 19:15:15 +00:00
Geoff Mendal
2c636248dd
am e618963b: (-s ours) am 035e10f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'e618963b93c81694124d61eab6528cabf5edfdc8':
Import translations. DO NOT MERGE
2015-08-08 19:08:07 +00:00
Geoff Mendal
e618963b93
am 035e10f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '035e10f8f5d47d0c39d8582c079c490075a1d650':
Import translations. DO NOT MERGE
2015-08-08 19:01:35 +00:00
Geoff Mendal
035e10f8f5
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-08-08 18:55:37 +00:00
Geoff Mendal
5d4994b498
Import translations. DO NOT MERGE
...
Change-Id: I1c9149946ceaaa41d36a305c338336f27d0224d3
Auto-generated-cl: translation import
2015-08-08 11:13:47 -05:00
Geoff Mendal
bf78963c5d
am 8eafcc16: (-s ours) am bf965352: (-s ours) am e53e421e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '8eafcc164756869f6a8529cb6b5683483eb6639b':
Import translations. DO NOT MERGE
2015-08-08 14:43:16 +00:00
Geoff Mendal
c61bd18d2b
am cc92ae98: (-s ours) am 2c997149: (-s ours) am ba4a568c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'cc92ae9871acdb4d15e2badbfe37e8cdebffe639':
Import translations. DO NOT MERGE
2015-08-08 14:43:10 +00:00
Geoff Mendal
8eafcc1647
am bf965352: (-s ours) am e53e421e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'bf965352df56939979a175371adc032fb9e7f3f2':
Import translations. DO NOT MERGE
2015-08-08 14:34:39 +00:00
Geoff Mendal
cc92ae9871
am 2c997149: (-s ours) am ba4a568c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '2c9971498b7cd0701c069f228cca86e95c58f8be':
Import translations. DO NOT MERGE
2015-08-08 14:34:34 +00:00
Geoff Mendal
ba5740fd91
am 6468a297: (-s ours) am 326afbf4: (-s ours) am 2393f7e2: (-s ours) Import translations. DO NOT MERGE
...
* commit '6468a29765cefff2ae094896dd2ce4092b5d2049':
Import translations. DO NOT MERGE
2015-08-08 14:34:28 +00:00
Geoff Mendal
6468a29765
am 326afbf4: (-s ours) am 2393f7e2: (-s ours) Import translations. DO NOT MERGE
...
* commit '326afbf438c9676cbc5e0ce478b280a452391dde':
Import translations. DO NOT MERGE
2015-08-08 14:28:21 +00:00
Geoff Mendal
bf965352df
am e53e421e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'e53e421e1e7b819728a12af6fb4a1ec8a916063a':
Import translations. DO NOT MERGE
2015-08-08 14:27:48 +00:00
Geoff Mendal
2c9971498b
am ba4a568c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'ba4a568cf8c017666231253d78f54d9fbe0f2cbc':
Import translations. DO NOT MERGE
2015-08-08 14:27:42 +00:00
Geoff Mendal
326afbf438
am 2393f7e2: (-s ours) Import translations. DO NOT MERGE
...
* commit '2393f7e282d10a69c2823c41c44e821998548d21':
Import translations. DO NOT MERGE
2015-08-08 14:22:11 +00:00
Geoff Mendal
e53e421e1e
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-08-08 14:21:20 +00:00
Geoff Mendal
ba4a568cf8
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-08-08 14:20:49 +00:00
Geoff Mendal
bdd5db78c7
Import translations. DO NOT MERGE
...
Change-Id: I2bf98a2ed7790b147b2b13c460a52bb79c4b8db7
Auto-generated-cl: translation import
2015-08-08 07:16:18 -07:00
Geoff Mendal
283c030130
Import translations. DO NOT MERGE
...
Change-Id: Ib02888af570eee35060b2c624eaaaee25df11ea6
Auto-generated-cl: translation import
2015-08-08 07:14:55 -07:00
Geoff Mendal
2393f7e282
Import translations. DO NOT MERGE
...
Change-Id: I8efa511283a9b372c6386dd3a3396abee1d10780
Auto-generated-cl: translation import
2015-08-08 07:13:01 -07:00
Svetoslav Ganov
618e065cc1
am 546a3449: am e12a685c: am 02d6c013: am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev
...
* commit '546a34490fbb31e40199e325473c5a510b61b55b':
Do not show removed permissions in the UI - framework
2015-08-08 07:15:24 +00:00
Svetoslav Ganov
546a34490f
am e12a685c: am 02d6c013: am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev
...
* commit 'e12a685c37786f3b11da77ac6d20ee7d8d8f85fe':
Do not show removed permissions in the UI - framework
2015-08-08 07:10:17 +00:00
Dianne Hackborn
b2aff68c0d
am e98e0b45: am 0e6bd33e: am 42f6d217: am fc81be94: Merge "Fix issue #23037093 : "Write system settings" permission value fails..." into mnc-dev
...
* commit 'e98e0b4544a970039b3e01b50d8d282dad96c260':
Fix issue #23037093 : "Write system settings" permission value fails...
2015-08-08 07:07:13 +00:00
Svetoslav Ganov
e12a685c37
am 02d6c013: am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev
...
* commit '02d6c013e4be4b5e09562c922506c1153347d161':
Do not show removed permissions in the UI - framework
2015-08-08 07:03:16 +00:00
Dianne Hackborn
e98e0b4544
am 0e6bd33e: am 42f6d217: am fc81be94: Merge "Fix issue #23037093 : "Write system settings" permission value fails..." into mnc-dev
...
* commit '0e6bd33efa9a49832186fcf9735e5a895d33ea68':
Fix issue #23037093 : "Write system settings" permission value fails...
2015-08-08 07:00:44 +00:00
Svetoslav Ganov
02d6c013e4
am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev
...
* commit '90b030bae8cc1f13da7948fef4aff1d171a2885a':
Do not show removed permissions in the UI - framework
2015-08-08 06:57:32 +00:00
Dianne Hackborn
0e6bd33efa
am 42f6d217: am fc81be94: Merge "Fix issue #23037093 : "Write system settings" permission value fails..." into mnc-dev
...
* commit '42f6d217f55ed0891f6f438fd22cc54f5da3a1f3':
Fix issue #23037093 : "Write system settings" permission value fails...
2015-08-08 06:51:30 +00:00
Svetoslav Ganov
90b030bae8
Merge "Do not show removed permissions in the UI - framework" into mnc-dev
2015-08-08 06:48:38 +00:00
Dianne Hackborn
42f6d217f5
am fc81be94: Merge "Fix issue #23037093 : "Write system settings" permission value fails..." into mnc-dev
...
* commit 'fc81be947fcbb0d738a75eb2c6d560c52f7f9a99':
Fix issue #23037093 : "Write system settings" permission value fails...
2015-08-08 06:43:39 +00:00
Dianne Hackborn
fc81be947f
Merge "Fix issue #23037093 : "Write system settings" permission value fails..." into mnc-dev
2015-08-08 06:35:03 +00:00
Svet Ganov
3e0be7440b
Do not show removed permissions in the UI - framework
...
bug:23043018
Change-Id: Ia5cf49f299eda627d9fde2b34498812afcb3a6d5
2015-08-07 23:06:04 -07:00
Dianne Hackborn
4d34bb8304
Fix issue #23037093 : "Write system settings" permission value fails...
...
...to persist after reboot
We were writing a corrupt settings file, so would always reset back
to the default app ops state after boot...!
Also add new appops service commands to manually write and read
its settings, since that is very useful for testing.
Change-Id: Ia510507764738fd82e45ec0be6db840c6ea30c28
2015-08-07 18:37:21 -07:00
Ruben Brunk
ffbe794353
am 1a232510: am 3b006485: am ae81ebf8: Merge "camera2: Update DngCreator with bad pixel opcode." into mnc-dr-dev
...
* commit '1a2325105f88b6160409299ca9b6668e128a1beb':
camera2: Update DngCreator with bad pixel opcode.
2015-08-07 23:34:40 +00:00
Ruben Brunk
1a2325105f
am 3b006485: am ae81ebf8: Merge "camera2: Update DngCreator with bad pixel opcode." into mnc-dr-dev
...
* commit '3b006485574e05dc7d715daa14bb7948083307e4':
camera2: Update DngCreator with bad pixel opcode.
2015-08-07 23:27:54 +00:00
Ruben Brunk
3b00648557
am ae81ebf8: Merge "camera2: Update DngCreator with bad pixel opcode." into mnc-dr-dev
...
* commit 'ae81ebf8921073ab8279d8fca478d9b335c36bcb':
camera2: Update DngCreator with bad pixel opcode.
2015-08-07 23:20:05 +00:00
Ruben Brunk
ae81ebf892
Merge "camera2: Update DngCreator with bad pixel opcode." into mnc-dr-dev
2015-08-07 23:11:50 +00:00
Bryce Lee
08e09f9617
am ef56bfb2: am 3e96e06f: Merge "Make sure that changes to UI in SwipeDismissLayout are on UI thread." into cw-e-dev
...
* commit 'ef56bfb27ae259116fe41fa4b6157828fc67f344':
Make sure that changes to UI in SwipeDismissLayout are on UI thread.
2015-08-07 22:49:58 +00:00
Billy Lau
4a10b66df3
am 99271a39: am 9751afcf: am 26ab6ed3: am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '99271a3995e35c64105b2778f695ca6dd716a3f2':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:49:52 +00:00
Bryce Lee
ef56bfb27a
am 3e96e06f: Merge "Make sure that changes to UI in SwipeDismissLayout are on UI thread." into cw-e-dev
...
* commit '3e96e06f12cc0944c9954fc654504f9376f13fc1':
Make sure that changes to UI in SwipeDismissLayout are on UI thread.
2015-08-07 22:40:59 +00:00
Billy Lau
99271a3995
am 9751afcf: am 26ab6ed3: am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '9751afcfbc273fecd9f1eafadd25c85e57b4046b':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:40:53 +00:00
Bryce Lee
3e96e06f12
Merge "Make sure that changes to UI in SwipeDismissLayout are on UI thread." into cw-e-dev
2015-08-07 22:37:11 +00:00
Billy Lau
9751afcfbc
am 26ab6ed3: am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '26ab6ed3efd9bc55e342caabade46d00f8304240':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:34:20 +00:00
Dianne Hackborn
0385e3e908
am 8e63bbfd: am efa4dee1: am 977d421a: am f0e5501e: Merge "Fix issue #22989030 : Separate battery whitelists" into mnc-dev
...
* commit '8e63bbfd00ee27fcdbb04cfc0cf96ccdb2c50cc5':
Fix issue #22989030 : Separate battery whitelists
2015-08-07 22:30:17 +00:00
Billy Lau
26ab6ed3ef
am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '70f998e57df2b3ed79331669a93a0ba314f25e7d':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:22:24 +00:00
Dianne Hackborn
8e63bbfd00
am efa4dee1: am 977d421a: am f0e5501e: Merge "Fix issue #22989030 : Separate battery whitelists" into mnc-dev
...
* commit 'efa4dee1263f0e332f015affbcef2234f38e2e93':
Fix issue #22989030 : Separate battery whitelists
2015-08-07 22:20:56 +00:00
Billy Lau
70f998e57d
Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
2015-08-07 22:16:03 +00:00
Bryce Lee
8a148a3b1d
Make sure that changes to UI in SwipeDismissLayout are on UI thread.
...
Bug: 23036658
Change-Id: I2f51f7275c24f32c5f291f58b0dd331e608d8beb
2015-08-07 15:15:56 -07:00
Dianne Hackborn
efa4dee126
am 977d421a: am f0e5501e: Merge "Fix issue #22989030 : Separate battery whitelists" into mnc-dev
...
* commit '977d421af9466ed6cd83630f6ba91c873f501e5b':
Fix issue #22989030 : Separate battery whitelists
2015-08-07 22:13:02 +00:00
Dianne Hackborn
977d421af9
am f0e5501e: Merge "Fix issue #22989030 : Separate battery whitelists" into mnc-dev
...
* commit 'f0e5501e093c688cd293308e0aafc2b55326c255':
Fix issue #22989030 : Separate battery whitelists
2015-08-07 22:06:00 +00:00
Dianne Hackborn
f0e5501e09
Merge "Fix issue #22989030 : Separate battery whitelists" into mnc-dev
2015-08-07 21:58:38 +00:00
Matthew Williams
b244ed0353
am b64f25ad: am 253f2c33: am 2327dd3f: am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev
...
* commit 'b64f25ad97a92be4dcf8844c79c218ae9c1e0af4':
Correctly skip files that are excluded from restore
2015-08-07 21:53:21 +00:00
