Chris Wren
c53c63ecd8
am 7734e807: am 95ac6029: am 209a72ca: am b6d8b5f6: am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
...
* commit '7734e807986daa34fa7b8d0d729dc0dd9ea912d4':
import new view enums into MetricsLogger
2015-07-14 16:42:06 +00:00
Geoff Mendal
9bc6301992
am e3f33af2: (-s ours) am f1507ef3: (-s ours) am 1e9aca41: (-s ours) am d8b05ce2: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'e3f33af29b57e164f56efc009c606e44066faf96':
Import translations. DO NOT MERGE
2015-07-14 16:42:05 +00:00
Zoltan Szatmary-Ban
25b3876b19
am ba79dc4d: am 0998e03a: am e4e52064: am c968c407: am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
...
* commit 'ba79dc4d32e6fb909732b04b9cec562aa4a762da':
Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-14 16:42:04 +00:00
Geoff Mendal
5f05b6ddf9
am 14940f9b: (-s ours) am 4c415361: (-s ours) am ed45bc30: (-s ours) am 92a33ff7: (-s ours) am da15ade8: (-s ours) Import translations. DO NOT MERGE
...
* commit '14940f9bc6c67541f2f99820ce2e1688a0f1196d':
Import translations. DO NOT MERGE
2015-07-14 16:42:02 +00:00
Chris Wren
7734e80798
am 95ac6029: am 209a72ca: am b6d8b5f6: am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
...
* commit '95ac602959ce41465ab8e8922659c471a33e7fed':
import new view enums into MetricsLogger
2015-07-14 16:25:20 +00:00
Geoff Mendal
e3f33af29b
am f1507ef3: (-s ours) am 1e9aca41: (-s ours) am d8b05ce2: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'f1507ef3dd8b296329d514ec87a6efbcc8ac249e':
Import translations. DO NOT MERGE
2015-07-14 16:25:19 +00:00
Zoltan Szatmary-Ban
ba79dc4d32
am 0998e03a: am e4e52064: am c968c407: am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
...
* commit '0998e03a8dfa01cf62649e2d277e0b8556b1ffc9':
Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-14 16:25:17 +00:00
Geoff Mendal
14940f9bc6
am 4c415361: (-s ours) am ed45bc30: (-s ours) am 92a33ff7: (-s ours) am da15ade8: (-s ours) Import translations. DO NOT MERGE
...
* commit '4c41536153d381f1b9b00e7ef74e5e5d50530caa':
Import translations. DO NOT MERGE
2015-07-14 16:25:16 +00:00
Maurice Lam
48b11b8158
am 49e0b9fd: am a2511269: am 39f92c0f: am c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
...
* commit '49e0b9fdff9741f51e69683b2f79b6079d344a67':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-14 00:25:35 +00:00
Chris Wren
95ac602959
am 209a72ca: am b6d8b5f6: am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
...
* commit '209a72cab17a48b549484982817bb13513d96cd3':
import new view enums into MetricsLogger
2015-07-14 00:15:00 +00:00
Geoff Mendal
f1507ef3dd
am 1e9aca41: (-s ours) am d8b05ce2: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '1e9aca417c87308cc95433fde1ed679b8ccff150':
Import translations. DO NOT MERGE
2015-07-14 00:14:59 +00:00
Zoltan Szatmary-Ban
0998e03a8d
am e4e52064: am c968c407: am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
...
* commit 'e4e520641d7c0b2b173a830dcd7a5a2bcb767ebf':
Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-14 00:14:55 +00:00
Geoff Mendal
4c41536153
am ed45bc30: (-s ours) am 92a33ff7: (-s ours) am da15ade8: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ed45bc30708e6b4bbf828f5a23ec2d656b8e01da':
Import translations. DO NOT MERGE
2015-07-14 00:14:54 +00:00
Maurice Lam
49e0b9fdff
am a2511269: am 39f92c0f: am c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
...
* commit 'a2511269745c7d8ae101996d02905fbed3c5bfe7':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-13 23:50:34 +00:00
Chris Wren
209a72cab1
am b6d8b5f6: am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
...
* commit 'b6d8b5f6a4dfd5838f9e35d9ddd840e80f5bfec6':
import new view enums into MetricsLogger
2015-07-13 23:34:47 +00:00
Geoff Mendal
1e9aca417c
am d8b05ce2: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'd8b05ce25f1f4c3d0686b4a45f8c5ba8bcec6fbb':
Import translations. DO NOT MERGE
2015-07-13 23:34:46 +00:00
Zoltan Szatmary-Ban
e4e520641d
am c968c407: am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
...
* commit 'c968c407f809f06dda02dffe25ea2a4ee9f4cb15':
Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-13 23:34:45 +00:00
Geoff Mendal
ed45bc3070
am 92a33ff7: (-s ours) am da15ade8: (-s ours) Import translations. DO NOT MERGE
...
* commit '92a33ff73e5447fe89ed091e96efb07f8e6cfcfd':
Import translations. DO NOT MERGE
2015-07-13 23:34:44 +00:00
Chris Wren
b6d8b5f6a4
am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
...
* commit '2f8bb8ea97e87cacbe307c1d78fa7a6e096530eb':
import new view enums into MetricsLogger
2015-07-13 23:01:29 +00:00
Geoff Mendal
d8b05ce25f
am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '536ed1847863776335576699cdbe828b62f35a0f':
Import translations. DO NOT MERGE
2015-07-13 23:01:18 +00:00
Zoltan Szatmary-Ban
c968c407f8
am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
...
* commit '098c296df2388bbcc906e8e149743eea7467b0a8':
Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-13 23:01:11 +00:00
Geoff Mendal
92a33ff73e
am da15ade8: (-s ours) Import translations. DO NOT MERGE
...
* commit 'da15ade8300bb875b8d874e1f68032f6ffe95719':
Import translations. DO NOT MERGE
2015-07-13 23:00:39 +00:00
Maurice Lam
a251126974
am 39f92c0f: am c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
...
* commit '39f92c0f54f40bacff42d24d02431ba6744cf2d5':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-13 22:48:25 +00:00
Maurice Lam
39f92c0f54
am c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
...
* commit 'c6178ba01236b60e90cc993103c633ea7eca299d':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-13 22:34:42 +00:00
Maurice Lam
c6178ba012
Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
2015-07-13 20:20:57 +00:00
Chris Wren
2f8bb8ea97
Merge "import new view enums into MetricsLogger" into mnc-dev
2015-07-13 16:21:26 +00:00
Geoff Mendal
b59ef5ad39
am b785dfae: (-s ours) am cc95aedc: (-s ours) am c2175d78: (-s ours) am a52bf201: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b785dfae7e96581d16ccf0427644cb61e0fb81bb':
Import translations. DO NOT MERGE
2015-07-13 15:50:40 +00:00
Geoff Mendal
905c79105b
am 567c3a03: (-s ours) am 5fb58ffc: (-s ours) am b30eaa84: (-s ours) am 7174a3d7: (-s ours) Import translations. DO NOT MERGE
...
* commit '567c3a030d796f401981f62d4432b8d5c963e4c8':
Import translations. DO NOT MERGE
2015-07-13 15:50:39 +00:00
Geoff Mendal
b785dfae7e
am cc95aedc: (-s ours) am c2175d78: (-s ours) am a52bf201: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cc95aedca49c204a4b6c25cd3e4682d09d2dcaf6':
Import translations. DO NOT MERGE
2015-07-13 15:36:22 +00:00
Geoff Mendal
567c3a030d
am 5fb58ffc: (-s ours) am b30eaa84: (-s ours) am 7174a3d7: (-s ours) Import translations. DO NOT MERGE
...
* commit '5fb58ffc5e419d091472697e82cf7e0e7e4de833':
Import translations. DO NOT MERGE
2015-07-13 15:36:21 +00:00
Geoff Mendal
cc95aedca4
am c2175d78: (-s ours) am a52bf201: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c2175d78421d1f35a53a37e37bd97150a900bf37':
Import translations. DO NOT MERGE
2015-07-13 15:25:36 +00:00
Geoff Mendal
5fb58ffc5e
am b30eaa84: (-s ours) am 7174a3d7: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b30eaa843c0fb31df2b7157c05ad7d01d3e0d35e':
Import translations. DO NOT MERGE
2015-07-13 15:25:35 +00:00
Geoff Mendal
c2175d7842
am a52bf201: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a52bf2017292a6da41d9b6950a1564710a94367e':
Import translations. DO NOT MERGE
2015-07-13 15:11:43 +00:00
Geoff Mendal
b30eaa843c
am 7174a3d7: (-s ours) Import translations. DO NOT MERGE
...
* commit '7174a3d7011fa4456bebe7e7b55f47aaed013d29':
Import translations. DO NOT MERGE
2015-07-13 15:10:40 +00:00
Geoff Mendal
a52bf20172
Import translations. DO NOT MERGE
...
Change-Id: I75a6759a8ccd3a922121912e0c2bdb291fda3e56
Auto-generated-cl: translation import
2015-07-13 07:08:00 -07:00
Geoff Mendal
536ed18478
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-07-13 13:54:00 +00:00
Geoff Mendal
a0838470f3
Import translations. DO NOT MERGE
...
Change-Id: Ice9d7f5cfe191a669657298432c0ecfae0f438bb
Auto-generated-cl: translation import
2015-07-13 06:53:26 -07:00
Zoltan Szatmary-Ban
098c296df2
Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
2015-07-13 13:09:54 +00:00
Geoff Mendal
15069c82b4
Import translations. DO NOT MERGE
...
Change-Id: I44582b10dbf32b9feb774da997c56795303499d4
Auto-generated-cl: translation import
2015-07-13 06:04:46 -07:00
Zoltan Szatmary-Ban
706e7014d8
Do not throw exception when MeasurementDetails.mediaSize is empty
...
It is legitimate for StorageMeasurement.measureExactStorage to return without any user keys
added to the returned MeasurementDetails, when the following is true:
mVolume == null || !mVolume.isMountedReadable()
Bug: 22394495
Change-Id: Ie40bd468a487208d98dc56aae41fdad7098f41a5
2015-07-13 12:37:31 +01:00
Geoff Mendal
7174a3d701
Import translations. DO NOT MERGE
...
Change-Id: I73a807d112306b787b9975ee0c2560a2431f031b
Auto-generated-cl: translation import
2015-07-11 13:37:38 -05:00
Geoff Mendal
da15ade830
Import translations. DO NOT MERGE
...
Change-Id: Ib1f4051b1001de52b74483fc18eaf909e656de67
Auto-generated-cl: translation import
2015-07-11 06:59:16 -07:00
Geoff Mendal
2eb61989eb
Import translations. DO NOT MERGE
...
Change-Id: I9c48ee964f67f56f9996cb44262a05d0c75cf463
Auto-generated-cl: translation import
2015-07-11 06:11:22 -07:00
Maurice Lam
052297172e
[Fingerprint] Export FingerprintEnrollIntroduction
...
Export FingerprintEnrollIntroduction activity under the permission
USE_FINGERPRINT so that setup wizard can start it.
Bug: 21695577
Change-Id: If466c6e484a4aa0c10382cfedab0aad10ae26702
2015-07-10 21:00:02 -07:00
Chris Wren
ef94267afd
import new view enums into MetricsLogger
...
Bug: 21114836
Change-Id: I9a6e00ab8d85726ca6505a28ca7a52aef5aa1e1a
2015-07-10 17:19:58 -04:00
Robin Lee
4e3635d8db
am 722d5e22: am be638020: am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
...
* commit '722d5e221aef34220f0e6be874f62b14b7dea13f':
Match getLegacyVpn calls to changed interface
2015-07-10 20:09:32 +00:00
Robin Lee
722d5e221a
am be638020: am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
...
* commit 'be638020e55c29b0b283713fb42c9866960b5755':
Match getLegacyVpn calls to changed interface
2015-07-10 19:55:12 +00:00
Rubin Xu
46175909ed
am 6e2c1c2e: am bd2e045e: am a383b02c: am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
...
* commit '6e2c1c2e68f6ff40c7201550446e29c8411154b7':
Remove unused MediaFormat activity
2015-07-10 19:47:04 +00:00
Jason Monk
9b8bfc56bc
am d5c8980a: am 8b35321f: am 93623850: am c07450ae: am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
...
* commit 'd5c8980a3b270ed9ebad365773417f9338252ef0':
Fix wifi not re-ordering
2015-07-10 19:47:03 +00:00
Robin Lee
be638020e5
am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
...
* commit '719cbc4acfe01d3aaf0dfb1061c06b69b7db2d29':
Match getLegacyVpn calls to changed interface
2015-07-10 19:41:01 +00:00
