Jason Monk
0095930e12
am 1c8a483c: am a82961f1: am f8577c68: Merge "Support disabled until used apps" into mnc-dev
...
* commit '1c8a483cb662da6b6aa685558e0058bebdc13251':
Support disabled until used apps
2015-06-17 20:59:55 +00:00
Jason Monk
0036894557
am f5269f3b: am c3570166: am 2ab42701: Merge "Fix accessibility for empty list on notification access" into mnc-dev
...
* commit 'f5269f3bdedc9bb3087732e589a4f4c0ad18e63d':
Fix accessibility for empty list on notification access
2015-06-17 20:59:54 +00:00
Jason Monk
1c8a483cb6
am a82961f1: am f8577c68: Merge "Support disabled until used apps" into mnc-dev
...
* commit 'a82961f108e18eaefb836f83fe1508c706a563b1':
Support disabled until used apps
2015-06-17 20:53:32 +00:00
Jason Monk
f5269f3bde
am c3570166: am 2ab42701: Merge "Fix accessibility for empty list on notification access" into mnc-dev
...
* commit 'c3570166c2484f76e73e76eecdf8cd2870d1a0ac':
Fix accessibility for empty list on notification access
2015-06-17 20:53:31 +00:00
Jason Monk
a82961f108
am f8577c68: Merge "Support disabled until used apps" into mnc-dev
...
* commit 'f8577c68afbf4965211ca99233f7c5e40560e566':
Support disabled until used apps
2015-06-17 20:41:36 +00:00
Jason Monk
c3570166c2
am 2ab42701: Merge "Fix accessibility for empty list on notification access" into mnc-dev
...
* commit '2ab427010ae16af8756347cefac6350ce83041e8':
Fix accessibility for empty list on notification access
2015-06-17 20:41:34 +00:00
Jason Monk
f8577c68af
Merge "Support disabled until used apps" into mnc-dev
2015-06-17 20:31:27 +00:00
Jason Monk
2ab427010a
Merge "Fix accessibility for empty list on notification access" into mnc-dev
2015-06-17 20:31:17 +00:00
Jason Monk
6baf98eb46
Fix accessibility for empty list on notification access
...
Bug: 21797352
Change-Id: I6c68c9abb43c6dfcc8b0a4d07cfe0d4cede6e817
2015-06-17 15:42:45 -04:00
Makoto Onuki
35d43fbe98
am 1cc4bd33: am a42d94d8: am 9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
...
* commit '1cc4bd33265302cfdca55553a5fa746a8265aea7':
Don't crash on NameNotFoundException
2015-06-17 18:23:21 +00:00
Makoto Onuki
1cc4bd3326
am a42d94d8: am 9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
...
* commit 'a42d94d82e72c5ef0e99cb9f755673c82e3f8955':
Don't crash on NameNotFoundException
2015-06-17 18:15:09 +00:00
Makoto Onuki
a42d94d82e
am 9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
...
* commit '9f2b5a74420988824dd3a91abcdb85bea6fc48fa':
Don't crash on NameNotFoundException
2015-06-17 17:57:56 +00:00
Makoto Onuki
9f2b5a7442
Merge "Don't crash on NameNotFoundException" into mnc-dev
2015-06-17 17:46:50 +00:00
Makoto Onuki
302b77f425
Don't crash on NameNotFoundException
...
Just finish().
Bug 20672468
Change-Id: Ic600e060990b7e3bc3e98bda63d0f4c9e530fb94
2015-06-17 10:22:28 -07:00
Geoff Mendal
2bbbafdd88
am 6a28e257: (-s ours) am 7343ecc7: (-s ours) am 2eb7ad26: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '6a28e2573a210ecaf976e21cc5c4fddd75afa374':
Import translations. DO NOT MERGE
2015-06-17 15:58:38 +00:00
Geoff Mendal
6a28e2573a
am 7343ecc7: (-s ours) am 2eb7ad26: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '7343ecc71fff3aae7ca1721a958d18850b7dc04e':
Import translations. DO NOT MERGE
2015-06-17 15:44:51 +00:00
Geoff Mendal
7343ecc71f
am 2eb7ad26: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '2eb7ad2648e85f2474d271499ec43241264ca148':
Import translations. DO NOT MERGE
2015-06-17 15:32:25 +00:00
Geoff Mendal
2eb7ad2648
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-06-17 15:23:34 +00:00
Geoff Mendal
38f0b79f33
Import translations. DO NOT MERGE
...
Change-Id: I1ec85dbe877d7fae6edf1f93ec812bc7b1223daa
Auto-generated-cl: translation import
2015-06-17 07:59:14 -07:00
Geoff Mendal
7b1cca8834
Merge "Import translations. DO NOT MERGE"
2015-06-17 14:29:23 +00:00
Geoff Mendal
a2bb6038c2
Import translations. DO NOT MERGE
...
Change-Id: I74442ac6e0aab88878469be16d6518bd1af75861
Auto-generated-cl: translation import
2015-06-17 07:27:41 -07:00
Jason Monk
3ea384e1da
am f424ccf7: (-s ours) am 5c2de952: am 7fdb1478: RIP -night DO NOT MERGE
...
* commit 'f424ccf7433be32c9bf9c29d388beb0e6fe94267':
RIP -night DO NOT MERGE
2015-06-17 13:58:35 +00:00
Jason Monk
f424ccf743
am 5c2de952: am 7fdb1478: RIP -night DO NOT MERGE
...
* commit '5c2de952e5e7f2501df7a5a94794e526902e47a3':
RIP -night DO NOT MERGE
2015-06-17 13:47:00 +00:00
Jason Monk
5c2de952e5
am 7fdb1478: RIP -night DO NOT MERGE
...
* commit '7fdb1478728ed7eaab956da476540b3e9c97b9b3':
RIP -night DO NOT MERGE
2015-06-17 13:37:31 +00:00
Jason Monk
bce8496aef
am 840164a2: am 2abd5be3: am 7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev
...
* commit '840164a21ce2fa6638e4e2175bb1e36d4335f4a1':
Guard against callbacks when no list view created
2015-06-17 13:32:58 +00:00
Jason Monk
840164a21c
am 2abd5be3: am 7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev
...
* commit '2abd5be388fe29e0a70a4e69f95d6dcc56004a58':
Guard against callbacks when no list view created
2015-06-17 13:23:09 +00:00
Jason Monk
7fdb147872
RIP -night DO NOT MERGE
...
Bug: 21854466
Change-Id: Ied1512cb1d8c80df9f6c990f8f91f82d7f140533
2015-06-17 09:17:31 -04:00
Jason Monk
2abd5be388
am 7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev
...
* commit '7a5cb3b9c34af2215bdaaddba976f04bbafd06eb':
Guard against callbacks when no list view created
2015-06-17 13:09:18 +00:00
Jason Monk
7a5cb3b9c3
Merge "Guard against callbacks when no list view created" into mnc-dev
2015-06-17 13:01:28 +00:00
Jeff Sharkey
c162b354c2
am a39077c9: am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
...
* commit 'a39077c95bb51102e77e55a2d4e352f8027d5c24':
Actually gracefully finish this time around.
2015-06-17 03:54:31 +00:00
Jeff Sharkey
a39077c95b
am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
...
* commit '67832cc3984665cf55ac3d4afc5fdbb76326f1a0':
Actually gracefully finish this time around.
2015-06-17 03:45:06 +00:00
Jeff Sharkey
67832cc398
am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev
...
* commit '74c7f1fcd3451bdb5b49f2b44b86fd4ec8eb6794':
Actually gracefully finish this time around.
2015-06-17 03:31:44 +00:00
Jeff Sharkey
74c7f1fcd3
Merge "Actually gracefully finish this time around." into mnc-dev
2015-06-17 03:23:59 +00:00
Jeff Sharkey
665094c9d2
Actually gracefully finish this time around.
...
Also fix tinting on front-door icon.
Bug: 21403958
Change-Id: I74f0372a41b92235abe10391f36d9f6a1e6a40c5
2015-06-16 20:21:12 -07:00
Jim Miller
de1d7db439
am 8b5943c2: am dd0d9854: am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev
...
* commit '8b5943c2fb4d069797df0c1a4b43f2d604eb6385':
Fix issue with german translation of lock times
2015-06-17 00:33:52 +00:00
Jim Miller
8b5943c2fb
am dd0d9854: am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev
...
* commit 'dd0d9854a5e4e946e8cb55a91148f17e4424836f':
Fix issue with german translation of lock times
2015-06-17 00:20:35 +00:00
Jeff Sharkey
f322f66362
am 122b4d73: am 2ef947be: am 4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev
...
* commit '122b4d735f2f83ead436f4d6067ad1718c701004':
Gracefully finish when missing volume.
2015-06-17 00:20:02 +00:00
Jim Miller
dd0d9854a5
am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev
...
* commit '4b60af78fa8b0c474c9aee0f03171867843d2838':
Fix issue with german translation of lock times
2015-06-17 00:09:52 +00:00
Jeff Sharkey
122b4d735f
am 2ef947be: am 4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev
...
* commit '2ef947be79e6ecf5d5e8acfb054247a8902d7993':
Gracefully finish when missing volume.
2015-06-17 00:09:43 +00:00
Jim Miller
4b60af78fa
Merge "Fix issue with german translation of lock times" into mnc-dev
2015-06-16 23:59:43 +00:00
Jeff Sharkey
2ef947be79
am 4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev
...
* commit '4e42cbdba386a742b01871010ec8747e07471e29':
Gracefully finish when missing volume.
2015-06-16 23:56:37 +00:00
Jeff Sharkey
4e42cbdba3
Merge "Gracefully finish when missing volume." into mnc-dev
2015-06-16 23:48:07 +00:00
Jeff Sharkey
e79ff145f3
Gracefully finish when missing volume.
...
Bug: 21403958
Change-Id: Icb78bb633842571c4df696c9db72a5b97ece0655
2015-06-16 16:46:03 -07:00
Brian Carlstrom
8453e36188
am 99c1009a: am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
...
* commit '99c1009a897834e8282a59c0dda8f29dd33234e4':
dex2oat should show something friendlier in Settings -> Battery
2015-06-16 23:25:53 +00:00
Jim Miller
50d7d19a73
Fix issue with german translation of lock times
...
The word "immediately" would go into a different place in the sentence
than a number so we have to break this into two strings.
Fixes bug 21602326
Change-Id: Ie07f1bc84d68bdea8d6f1264dfd18326c2e48df4
2015-06-16 16:21:27 -07:00
Brian Carlstrom
99c1009a89
am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
...
* commit '49d73c03aa5b8b21c5e8a926b6a894245ffdf906':
dex2oat should show something friendlier in Settings -> Battery
2015-06-16 23:18:33 +00:00
Brian Carlstrom
49d73c03aa
am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
...
* commit '94f4cb4e4660db823d268d14eb1199dbc11f8e86':
dex2oat should show something friendlier in Settings -> Battery
2015-06-16 23:07:52 +00:00
Jeff Sharkey
1a1a109936
am aa1e5f2f: am 5fafa130: am 95b891af: Merge "Finish storage wizard theming." into mnc-dev
...
* commit 'aa1e5f2f001aa7cc39ce4b0c5974bfc47a8d96fa':
Finish storage wizard theming.
2015-06-16 23:00:45 +00:00
Makoto Onuki
bb2fdb5e92
am 3f507b2f: am abf80cb1: am d91ddfeb: Merge "Allow formatting when a partition is corrupt." into mnc-dev
...
* commit '3f507b2fbdbb8d1daac4703d365a740dbc4623f4':
Allow formatting when a partition is corrupt.
2015-06-16 23:00:44 +00:00
Brian Carlstrom
94f4cb4e46
Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
2015-06-16 22:59:04 +00:00
