Commit Graph

22375 Commits

Author SHA1 Message Date
Geoff Mendal
effb892289 am 696175c8: (-s ours) am e40dff3d: (-s ours) am c0d5b79c: (-s ours) am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit '696175c8473af962e08990007d582b831b74ccc7':
  Import translations. DO NOT MERGE
2015-07-25 16:54:18 +00:00
Adrian Roos
81ce2ea882 am 2f00f2c8: am 8fee8176: am b87428a6: am 5ada0050: am 38c9b9eb: Update FRP warning to spec
* commit '2f00f2c84a8e0f99c7ccb35157a63128ec98c19a':
  Update FRP warning to spec
2015-07-25 16:54:16 +00:00
Geoff Mendal
7a5349f381 am 9e671347: (-s ours) am 25929e7b: (-s ours) am 48ea7098: (-s ours) am 92ca0cbe: (-s ours) Import translations. DO NOT MERGE
* commit '9e671347f4106d5176b8c6350b2951504b6075e6':
  Import translations. DO NOT MERGE
2015-07-25 16:54:15 +00:00
Geoff Mendal
696175c847 am e40dff3d: (-s ours) am c0d5b79c: (-s ours) am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit 'e40dff3d186f1000c560fb3ffc169dd2631c8642':
  Import translations. DO NOT MERGE
2015-07-25 16:37:15 +00:00
Adrian Roos
2f00f2c84a am 8fee8176: am b87428a6: am 5ada0050: am 38c9b9eb: Update FRP warning to spec
* commit '8fee817698c3a238e3f373eb93f1607cd2cbea0e':
  Update FRP warning to spec
2015-07-25 16:37:13 +00:00
Geoff Mendal
9e671347f4 am 25929e7b: (-s ours) am 48ea7098: (-s ours) am 92ca0cbe: (-s ours) Import translations. DO NOT MERGE
* commit '25929e7bbf086f055757d4a08c0201d6f05dee83':
  Import translations. DO NOT MERGE
2015-07-25 16:37:12 +00:00
Geoff Mendal
e40dff3d18 am c0d5b79c: (-s ours) am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit 'c0d5b79c7da6d9c8d5560a76df4674d0e2f59cd3':
  Import translations. DO NOT MERGE
2015-07-25 16:15:07 +00:00
Adrian Roos
8fee817698 am b87428a6: am 5ada0050: am 38c9b9eb: Update FRP warning to spec
* commit 'b87428a61d99b920f4e4704709f6f2974346aba8':
  Update FRP warning to spec
2015-07-25 16:15:05 +00:00
Geoff Mendal
25929e7bbf am 48ea7098: (-s ours) am 92ca0cbe: (-s ours) Import translations. DO NOT MERGE
* commit '48ea7098220e8600320143a12d8b0816789300d8':
  Import translations. DO NOT MERGE
2015-07-25 16:15:04 +00:00
Geoff Mendal
c0d5b79c7d am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit '7b5c7e56553cfe6d8bcca5b56f8f96772b6f98ef':
  Import translations. DO NOT MERGE
2015-07-25 15:54:27 +00:00
Adrian Roos
b87428a61d am 5ada0050: am 38c9b9eb: Update FRP warning to spec
* commit '5ada0050b742f126ad6cf82c75ce374ce92722ad':
  Update FRP warning to spec
2015-07-25 15:54:26 +00:00
Geoff Mendal
48ea709822 am 92ca0cbe: (-s ours) Import translations. DO NOT MERGE
* commit '92ca0cbe8f0aab2d6efe59f384611275ea8aef00':
  Import translations. DO NOT MERGE
2015-07-25 15:53:32 +00:00
Geoff Mendal
d94ed34100 Import translations. DO NOT MERGE
Change-Id: Ib87467a14cbaa3f37add4e0ee2f214aaa4e05e69
Auto-generated-cl: translation import
2015-07-24 23:08:45 -07:00
Geoff Mendal
7b5c7e5655 am e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit 'e37e12321b125731dfff69240b6e49bd00de2a3c':
  Import translations. DO NOT MERGE
2015-07-25 00:59:51 +00:00
Adrian Roos
5ada0050b7 am 38c9b9eb: Update FRP warning to spec
* commit '38c9b9eb5ee2734c4f6f78854951e79bd9e9d3cf':
  Update FRP warning to spec
2015-07-25 00:59:08 +00:00
Geoff Mendal
48526f7f57 Import translations. DO NOT MERGE
Change-Id: I6757f72bd62c87fb898eaea77c3b7eefd7bd82fb
Auto-generated-cl: translation import
2015-07-24 17:22:30 -07:00
Geoff Mendal
92ca0cbe8f Import translations. DO NOT MERGE
Change-Id: Iee689b96e6d57b9968c5efb133425ca888099d46
Auto-generated-cl: translation import
2015-07-24 17:09:25 -07:00
Geoff Mendal
e37e12321b Import translations. DO NOT MERGE
Change-Id: Ic8304c3f1eb5a71815f72d71854fdcabca7204b8
Auto-generated-cl: translation import
2015-07-24 16:56:10 -07:00
Adrian Roos
38c9b9eb5e Update FRP warning to spec
Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227
2015-07-24 15:09:34 -07:00
Maurice Lam
9a946b3cac am 63c8217b: am 4ac567ac: am 11d1f6d3: am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit '63c8217bc95e5f29f0be5a964b45086c84372e35':
  [Fingerprint] Show skip button during SUW
2015-07-24 17:21:19 +00:00
Maurice Lam
63c8217bc9 am 4ac567ac: am 11d1f6d3: am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit '4ac567acce52d09a32e27dcdeacb1f7f899b5c08':
  [Fingerprint] Show skip button during SUW
2015-07-24 16:07:00 +00:00
Geoff Mendal
2610894752 am 25c404e5: (-s ours) am 217aebd3: (-s ours) am 13cd0b25: (-s ours) am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit '25c404e5bdc823e7f3856c4cae1adf365bf4b4e4':
  Import translations. DO NOT MERGE
2015-07-24 04:50:08 +00:00
Geoff Mendal
e93e1b86a6 am 4a74e076: (-s ours) am 03fe71ed: (-s ours) am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE
* commit '4a74e0761d6567ed3af5da86903e80d2dbf9cb78':
  Import translations. DO NOT MERGE
2015-07-24 04:50:07 +00:00
Svetoslav Ganov
c4b467e1f3 am 104c3d3d: am ea80c4b2: am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit '104c3d3d641f87bd18c35cd2e0d584a515b9fb32':
  Reset permissions and app links when clearing app preferences - settings
2015-07-24 04:50:05 +00:00
Jason Monk
47067c7f29 am 6d280250: am c9607b39: am e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit '6d2802502cbd69552de7a28c3850ec6d1a75cefc':
  Fix battery detail issues with "Android OS"
2015-07-24 04:50:03 +00:00
Jason Monk
39c9460f38 am 5bc0d610: am c19eac29: am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '5bc0d610ab0dc003afe356a1c8851d668ad2f5d8':
  Don't show disabled apps in ignore optimizations
2015-07-24 04:50:02 +00:00
Guang Zhu
5e83b0d9fa am 29936b07: am 5ea94a9c: am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
* commit '29936b072f9d1623b16356b6837d38b7c865cb60':
  Prevent monkey from changing adoptable storage settings
2015-07-24 04:50:00 +00:00
Pavel Zhamaitsiak
2fab133a24 am 5d652622: am ff381a20: am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit '5d652622e836738cff848ec4597ddaca92658db5':
  Add or remove WFC setting when Wireless settings activity is resumed
2015-07-24 04:49:59 +00:00
Colin Cross
dab025bdff resolved conflicts for merge of 769ba03b to master
Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b
2015-07-23 21:43:07 -07:00
Maurice Lam
4ac567acce am 11d1f6d3: am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit '11d1f6d3a135d85511fd5067012c29e4e17b346a':
  [Fingerprint] Show skip button during SUW
2015-07-24 04:38:06 +00:00
Geoff Mendal
25c404e5bd am 217aebd3: (-s ours) am 13cd0b25: (-s ours) am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit '217aebd32d709571d4fb765d498bb90ab23a9b53':
  Import translations. DO NOT MERGE
2015-07-24 03:46:11 +00:00
Geoff Mendal
4a74e0761d am 03fe71ed: (-s ours) am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE
* commit '03fe71ed0067a1c6937569ade4c583a914034173':
  Import translations. DO NOT MERGE
2015-07-24 03:46:10 +00:00
Svetoslav Ganov
104c3d3d64 am ea80c4b2: am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit 'ea80c4b2512a79e964968e235c85b145a089d3b9':
  Reset permissions and app links when clearing app preferences - settings
2015-07-24 03:46:08 +00:00
Jason Monk
6d2802502c am c9607b39: am e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit 'c9607b39f8e34b1091f28a27c47fb4dc408fd57c':
  Fix battery detail issues with "Android OS"
2015-07-24 03:46:07 +00:00
Jason Monk
5bc0d610ab am c19eac29: am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit 'c19eac29b6d439644e5fc5dc9504e126c61eb2e7':
  Don't show disabled apps in ignore optimizations
2015-07-24 03:46:06 +00:00
Guang Zhu
29936b072f am 5ea94a9c: am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
* commit '5ea94a9c4d27d02d989ab8571bde97112bb1747e':
  Prevent monkey from changing adoptable storage settings
2015-07-24 03:46:04 +00:00
Pavel Zhamaitsiak
5d652622e8 am ff381a20: am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit 'ff381a20ca92597614f35507b663fdbcf8341cbf':
  Add or remove WFC setting when Wireless settings activity is resumed
2015-07-24 03:45:57 +00:00
Jason Monk
769ba03b8f am 0557f4c3: am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '0557f4c353448c55bbf82a8be75e515cf7f6371c':
  Remove tuner from development settings
2015-07-24 03:45:55 +00:00
Maurice Lam
11d1f6d3a1 am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit 'f16673bab63f950aa5687dc54b83515e35d4755f':
  [Fingerprint] Show skip button during SUW
2015-07-24 03:34:46 +00:00
Geoff Mendal
217aebd32d am 13cd0b25: (-s ours) am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit '13cd0b25734e215f3369b0c5367dafdc74c070da':
  Import translations. DO NOT MERGE
2015-07-24 03:26:34 +00:00
Geoff Mendal
03fe71ed00 am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE
* commit 'cb113be57e3eb49871c77ce5317d644963e033af':
  Import translations. DO NOT MERGE
2015-07-24 03:26:33 +00:00
Svetoslav Ganov
ea80c4b251 am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit '1fa5f4b33629a8995f44c56b3feb221ef0122477':
  Reset permissions and app links when clearing app preferences - settings
2015-07-24 03:26:31 +00:00
Jason Monk
c9607b39f8 am e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit 'e9b97364157c83ed9823f323e2f515bc2e5fc8be':
  Fix battery detail issues with "Android OS"
2015-07-24 03:26:30 +00:00
Jason Monk
c19eac29b6 am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '9b6ff57eb550215c30a16225e59a2c4d0af7de92':
  Don't show disabled apps in ignore optimizations
2015-07-24 03:26:29 +00:00
Guang Zhu
5ea94a9c4d am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
* commit 'b91da24db774829315087af3af09c90e89f496cb':
  Prevent monkey from changing adoptable storage settings
2015-07-24 03:26:26 +00:00
Pavel Zhamaitsiak
ff381a20ca am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit 'a20eaca1a68138e1077af72bca7f6e76f4332abe':
  Add or remove WFC setting when Wireless settings activity is resumed
2015-07-24 03:26:25 +00:00
Jason Monk
0557f4c353 am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit 'b46b9934037ce8801acd6582f26200ee952ddc68':
  Remove tuner from development settings
2015-07-24 03:26:23 +00:00
Maurice Lam
f16673bab6 am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit '36c760140900b2bc6aa2c7287199dae4ca86c568':
  [Fingerprint] Show skip button during SUW
2015-07-24 03:17:43 +00:00
Geoff Mendal
13cd0b2573 am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit 'f305e853a97be420eca536a510d8dca1c9877ef9':
  Import translations. DO NOT MERGE
2015-07-24 03:13:06 +00:00
Geoff Mendal
cb113be57e am 28718aeb: (-s ours) Import translations. DO NOT MERGE
* commit '28718aebd187fe68cf923422cde80103b0f6cbca':
  Import translations. DO NOT MERGE
2015-07-24 03:13:04 +00:00