199743 Commits

Author SHA1 Message Date
Jason Monk
91791b432e am 066b4047: am 0caac8ea: am fede4258: Merge "Remove bang from not connected wifi" into mnc-dev
* commit '066b4047f40d7d2b88542738bb6651a51d50c66e':
  Remove bang from not connected wifi
2015-07-08 18:06:07 +00:00
Eric Laurent
373a0b5c60 am dfea212b: am 070df444: am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev
* commit 'dfea212b18025a8899bf5e99f18f9506c43ac5b5':
  audio: add definitions for devices connected over IP
2015-07-08 18:06:00 +00:00
Jason Monk
066b4047f4 am 0caac8ea: am fede4258: Merge "Remove bang from not connected wifi" into mnc-dev
* commit '0caac8ea19f19d1051bb336e31d56370244f1589':
  Remove bang from not connected wifi
2015-07-08 17:51:27 +00:00
Eric Laurent
dfea212b18 am 070df444: am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev
* commit '070df444930cd9148998759bf30012937a56e564':
  audio: add definitions for devices connected over IP
2015-07-08 17:51:23 +00:00
Geoff Mendal
f5e7273796 am c8da7d53: (-s ours) am 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'c8da7d5366ee92a81d92d7e5c18fd769a1961032':
  Import translations. DO NOT MERGE
2015-07-08 17:51:22 +00:00
Geoff Mendal
c8da7d5366 am 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '3c573bc5699924f5c393043847b011669b718a67':
  Import translations. DO NOT MERGE
2015-07-08 17:39:29 +00:00
Jason Monk
0caac8ea19 am fede4258: Merge "Remove bang from not connected wifi" into mnc-dev
* commit 'fede4258fa1bf880c2b88ebea3c886003662fc74':
  Remove bang from not connected wifi
2015-07-08 17:38:57 +00:00
Eric Laurent
070df44493 am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev
* commit 'c0344a80fdb889c2b94dcfb869edf2afc5bb60df':
  audio: add definitions for devices connected over IP
2015-07-08 17:38:53 +00:00
Jason Monk
fede4258fa Merge "Remove bang from not connected wifi" into mnc-dev 2015-07-08 17:26:34 +00:00
Eric Laurent
c0344a80fd Merge "audio: add definitions for devices connected over IP" into mnc-dev 2015-07-08 17:24:23 +00:00
Geoff Mendal
3c573bc569 am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '4f5630e51d03980e80fde93154f5a0302c8179a2':
  Import translations. DO NOT MERGE
2015-07-08 17:00:13 +00:00
Geoff Mendal
4f5630e51d Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-08 16:45:22 +00:00
Geoff Mendal
8c1dfcecc3 Import translations. DO NOT MERGE
Change-Id: I81911866f73a1274582b6c93803eebff7e0e229e
Auto-generated-cl: translation import
2015-07-08 11:38:01 -05:00
Jeff Sharkey
a83bf1966e Use best volume description for MTP.
Otherwise we end up showing adopted storage devices as "Unknown."

Bug: 20275423
Change-Id: Ib42474fd5b3284b1e8eca7de8a4cfbb71a34a107
2015-07-08 09:29:24 -07:00
Jason Monk
7d0e5985de Remove bang from not connected wifi
Bug: 22281118
Change-Id: I4752c0e7378fca4a94c73083a8a394cde7d6f170
2015-07-08 12:09:52 -04:00
John Reck
0ea996cfe2 am 62a65071: am dcf8837d: Merge "Restrict number of hwuiTask threads" into mnc-dr-dev
* commit '62a650715df7aa29c9913d8bb064a8845eeda110':
  Restrict number of hwuiTask threads
2015-07-08 16:07:18 +00:00
John Reck
62a650715d am dcf8837d: Merge "Restrict number of hwuiTask threads" into mnc-dr-dev
* commit 'dcf8837d4902ea50f2421eecde64fe55e3d98b28':
  Restrict number of hwuiTask threads
2015-07-08 15:51:25 +00:00
John Reck
dcf8837d49 Merge "Restrict number of hwuiTask threads" into mnc-dr-dev 2015-07-08 15:40:44 +00:00
Chris Wren
289e9ebf32 am b9b021d0: am 4c0c6739: am 32c4802a: Merge "provide a cleaner notification dump" into mnc-dev
* commit 'b9b021d0d81312766aa1d72bda10bb06363fb85f':
  provide a cleaner notification dump
2015-07-08 15:29:04 +00:00
Chris Wren
b9b021d0d8 am 4c0c6739: am 32c4802a: Merge "provide a cleaner notification dump" into mnc-dev
* commit '4c0c6739d6b22ac84f24d53250e239f5e97b5470':
  provide a cleaner notification dump
2015-07-08 15:14:57 +00:00
Chris Wren
4c0c6739d6 am 32c4802a: Merge "provide a cleaner notification dump" into mnc-dev
* commit '32c4802a8ac624e0426888612533a4d649f349b9':
  provide a cleaner notification dump
2015-07-08 14:59:51 +00:00
Geoff Mendal
6097f946d1 am 6760080b: (-s ours) am f63da31f: (-s ours) am db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '6760080b5ec853f75d3775585de347429d23aee9':
  Import translations. DO NOT MERGE
2015-07-08 14:47:59 +00:00
Geoff Mendal
cb1486d0fa am 1fee4952: (-s ours) am 1e9b3cff: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '1fee49529e6310a2fc163f004e5f5299d006cb2f':
  Import translations. DO NOT MERGE
2015-07-08 14:47:53 +00:00
Chris Wren
32c4802a8a Merge "provide a cleaner notification dump" into mnc-dev 2015-07-08 14:46:32 +00:00
Benjamin Franz
12ceccaf7a am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
* commit '4b7d3b477f4405d5afe7f116e14037ac7c70e414':
  Clarify javadoc of setPermissionPolicy
2015-07-08 14:33:38 +00:00
Geoff Mendal
06ed218ddc am 5e60e7c1: (-s ours) am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE
* commit '5e60e7c1030630f4052fd29982c15fd4ed78ec5e':
  Import translations. DO NOT MERGE
2015-07-08 14:33:33 +00:00
Geoff Mendal
6760080b5e am f63da31f: (-s ours) am db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'f63da31f530ad43989f4269b22552df5ba3c15f7':
  Import translations. DO NOT MERGE
2015-07-08 14:32:50 +00:00
Geoff Mendal
1fee49529e am 1e9b3cff: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '1e9b3cffb910c63b568348aa6a21637ed208a087':
  Import translations. DO NOT MERGE
2015-07-08 14:32:47 +00:00
Benjamin Franz
4b7d3b477f am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
* commit '051762f77d5bf2c0dcbb05786ac5ae81086d596c':
  Clarify javadoc of setPermissionPolicy
2015-07-08 14:18:28 +00:00
Geoff Mendal
5e60e7c103 am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE
* commit 'eaaae47d8901dd59a536181e07d585fe29dc53cd':
  Import translations. DO NOT MERGE
2015-07-08 14:18:24 +00:00
Geoff Mendal
f63da31f53 am db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'db586e69afc71cbc9864849e29e77bf3b6d5ba3c':
  Import translations. DO NOT MERGE
2015-07-08 14:18:11 +00:00
Geoff Mendal
1e9b3cffb9 am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '18d4eaf54a60caaa2ffeae810a435bfad4abb59d':
  Import translations. DO NOT MERGE
2015-07-08 14:18:07 +00:00
Geoff Mendal
db586e69af Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-08 14:05:55 +00:00
Geoff Mendal
18d4eaf54a Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-08 14:04:01 +00:00
Benjamin Franz
051762f77d am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
* commit 'c088e30fd403b9843a00cc311e460734bd111c26':
  Clarify javadoc of setPermissionPolicy
2015-07-08 14:03:46 +00:00
Geoff Mendal
eaaae47d89 am 20ad9246: (-s ours) Import translations. DO NOT MERGE
* commit '20ad92460bf180abb1d2a154e8ec007ca2330e6d':
  Import translations. DO NOT MERGE
2015-07-08 14:03:42 +00:00
Benjamin Franz
c088e30fd4 Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 2015-07-08 13:59:34 +00:00
Geoff Mendal
ec135f6ac5 Import translations. DO NOT MERGE
Change-Id: I5480292e44e527d094f57361680708eba4aef6d8
Auto-generated-cl: translation import
2015-07-08 06:54:50 -07:00
Geoff Mendal
510cd45455 Import translations. DO NOT MERGE
Change-Id: I5571e07743dcea7a5e3f064599480796132cc31c
Auto-generated-cl: translation import
2015-07-08 06:48:51 -07:00
Geoff Mendal
20ad92460b Import translations. DO NOT MERGE
Change-Id: I173b85dbcf36fdc7023137949f7bb416dabc2cf5
Auto-generated-cl: translation import
2015-07-08 06:43:44 -07:00
Benjamin Franz
45dd6667e8 Clarify javadoc of setPermissionPolicy
Bug: 22192363
Change-Id: I552eae1e84ce866d9873faacb5c261321351915a
2015-07-08 14:37:28 +01:00
Dirk Dougherty
ea199baedb am 116183ac: am 37186001: am e3bb8e43: am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit '116183ac89ffe253991766819e7eb3f748c67761':
  Doc change -- update trade practices link.
2015-07-08 12:25:50 +00:00
Zoltan Szatmary-Ban
2fbfe42955 am 92c1d283: am 706ad39b: am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev
* commit '92c1d2834b4528593c66b64e188f8d556641705e':
  Prevent accidental unlocking of USB data transfer.
2015-07-08 12:25:43 +00:00
Dirk Dougherty
116183ac89 am 37186001: am e3bb8e43: am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit '3718600180a3496e7570e13dfae6088b89a22e81':
  Doc change -- update trade practices link.
2015-07-08 12:12:26 +00:00
Zoltan Szatmary-Ban
92c1d2834b am 706ad39b: am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev
* commit '706ad39b0a2b8388ab59e4c4cd86dbc65b9cc6cf':
  Prevent accidental unlocking of USB data transfer.
2015-07-08 12:12:22 +00:00
Zoltan Szatmary-Ban
5bc85aa8db am d426cf73: am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev
* commit 'd426cf737a2ecf827d0a44e607e2dbfd48c56e59':
  Expose time-interval detail query on INetworkStatsSession
2015-07-08 12:12:17 +00:00
Zoltan Szatmary-Ban
d426cf737a am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev
* commit '30871415dca603393b05e7fa2aa9013a3360b03d':
  Expose time-interval detail query on INetworkStatsSession
2015-07-08 11:58:14 +00:00
Dirk Dougherty
3718600180 am e3bb8e43: am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit 'e3bb8e4306f9f55e5039315c2dddface79ba9bca':
  Doc change -- update trade practices link.
2015-07-08 11:57:29 +00:00
Zoltan Szatmary-Ban
706ad39b0a am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev
* commit 'a2de7fc9fc0b96ba4db65ccf6c9684c8c27c2993':
  Prevent accidental unlocking of USB data transfer.
2015-07-08 11:57:25 +00:00
Dirk Dougherty
e3bb8e4306 am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit 'cc040d583b121e6a028e2dc47691d3f4f98c6e70':
  Doc change -- update trade practices link.
2015-07-08 11:49:01 +00:00