Commits · 90be39c7bb53e7840831e62054cec9ebd27f82a6 · halo / frameworks_base

29 Jul, 2016 1 commit

DO NOT MERGE: Fix CTS regression · 90be39c7

Sungsoo Lim authored 9 years ago

Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582

90be39c7

21 Jul, 2016 1 commit
- Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev · 3e582390
  Benjamin Franz authored 9 years ago
  
  3e582390
20 Jul, 2016 21 commits

Merge changes Id25696e4,I939a12a2 into klp-dev am: am: ... · 1e9889d5

Paul Stewart authored 9 years ago

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b55262 am: 2169197e am: 58555ee8 am: 2e85e2ef am: c92e93c4 am: bb7439d8
am: 0f9a968c

Change-Id: I5ef9b70287cd8b0beaa169f194e7011b8c354454

1e9889d5

Fix string equality comparison am: am: am: ... · f8d4c187

Paul Stewart authored 9 years ago

Fix string equality comparison am: 1033c6fd am: fdd4fe53 am: 3fbe9280 am: bf4f010a am: 700c72d0 am: 5d60d2f7
am: 62457749

Change-Id: Ib82209c5c6b71f3c47feaa17c346f853288b0131

f8d4c187

WifiEnterpriseConfiguration: Do not print credentials in toString am:... · d78a1453

Paul Stewart authored 9 years ago

WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d6 am: fa4bbf4a am: df93decc am: 141477b1 am: e2a03026 am: e41e0064
am: 701a6c1e

Change-Id: I34acfe2e2ab1da2615f5a7107a9879e7491b0857

d78a1453

Merge changes Id25696e4,I939a12a2 into klp-dev am: am: ... · 0f9a968c

Paul Stewart authored 9 years ago

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b55262 am: 2169197e am: 58555ee8 am: 2e85e2ef am: c92e93c4
am: bb7439d8

Change-Id: I0aa11cbba826189e7e5e4e9196654c4f43157de0

0f9a968c

Fix string equality comparison am: am: am: ... · 62457749

Paul Stewart authored 9 years ago

Fix string equality comparison am: 1033c6fd am: fdd4fe53 am: 3fbe9280 am: bf4f010a am: 700c72d0
am: 5d60d2f7

Change-Id: I1a0651d22571a4dec3b4b6ca97f6b62b930f1cc7

62457749

WifiEnterpriseConfiguration: Do not print credentials in toString am:... · 701a6c1e

Paul Stewart authored 9 years ago

WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d6 am: fa4bbf4a am: df93decc am: 141477b1 am: e2a03026
am: e41e0064

Change-Id: I9582c9327b859c981cb75d6aad52bb5dd1fafe20

701a6c1e

Merge changes Id25696e4,I939a12a2 into klp-dev am: am: ... · bb7439d8

Paul Stewart authored 9 years ago

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b55262 am: 2169197e am: 58555ee8 am: 2e85e2ef
am: c92e93c4

Change-Id: I50ca54dc65b61cb2dbb550eb964bd50938595168

bb7439d8

Fix string equality comparison am: 1033c6fd am: fdd4fe53 am: 3fbe9280 am: bf4f010a · 5d60d2f7
Paul Stewart authored 9 years ago
```
am: 700c72d0

Change-Id: I6fc08163a75790e15d05ab952ad4e706a1391916
```
5d60d2f7

WifiEnterpriseConfiguration: Do not print credentials in toString am:... · e41e0064

Paul Stewart authored 9 years ago

WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d6 am: fa4bbf4a am: df93decc am: 141477b1
am: e2a03026

Change-Id: Iba16c43199d5ab238ce129d37519f9c5a7ba2005

e41e0064

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b55262 am: 2169197e am: 58555ee8 · c92e93c4
Paul Stewart authored 9 years ago
```
am: 2e85e2ef

Change-Id: If8a2f4e1fcbb4adf6e2ddef438781fb83de04cc3
```
c92e93c4
Fix string equality comparison am: 1033c6fd am: fdd4fe53 am: 3fbe9280 · 700c72d0
Paul Stewart authored 9 years ago
```
am: bf4f010a

Change-Id: I7e57c484be20197748c40c80acd987802b43a734
```
700c72d0

WifiEnterpriseConfiguration: Do not print credentials in toString am:... · e2a03026

Paul Stewart authored 9 years ago

WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d6 am: fa4bbf4a am: df93decc
am: 141477b1

Change-Id: Ie4c9d06d225a2b99ebb4411e4282ea792c67d26b

e2a03026

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b55262 am: 2169197e · 2e85e2ef
Paul Stewart authored 9 years ago
```
am: 58555ee8

Change-Id: I1032efe65d45995a79572f669cddc5a4cf6131d9
```
2e85e2ef
Fix string equality comparison am: 1033c6fd am: fdd4fe53 · bf4f010a
Paul Stewart authored 9 years ago
```
am: 3fbe9280

Change-Id: Ib3bea7489d319bb94a41f3c8cb0d8ec7e40b14b7
```
bf4f010a
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d6 am: fa4bbf4a · 141477b1
Paul Stewart authored 9 years ago
```
am: df93decc

Change-Id: Iaeae846189a8f5fa38c5da988eec7879300f8ab5
```
141477b1
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b55262 · 58555ee8
Paul Stewart authored 9 years ago
```
am: 2169197e

Change-Id: I24f2c9f59336454aa071acca44d6aca5b44fda4a
```
58555ee8
Fix string equality comparison am: 1033c6fd · 3fbe9280
Paul Stewart authored 9 years ago
```
am: fdd4fe53

Change-Id: Id179c734fc503abea1216e7c6057d4903a17f340
```
3fbe9280
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d6 · df93decc
Paul Stewart authored 9 years ago
```
am: fa4bbf4a

Change-Id: I3ec1ff70fdfc2fd2aabf22ad1b7b3dad27ad4674
```
df93decc
Merge changes Id25696e4,I939a12a2 into klp-dev · 2169197e
Paul Stewart authored 9 years ago
```
am: 77b55262

Change-Id: I07fc88a342c3c6d1594832d0a05dd0734eb48424
```
2169197e
Fix string equality comparison · fdd4fe53
Paul Stewart authored 9 years ago
```
am: 1033c6fd

Change-Id: I6503cb15fdc0741b6c6c2da9ee14057265f87545
```
fdd4fe53
WifiEnterpriseConfiguration: Do not print credentials in toString · fa4bbf4a
Paul Stewart authored 9 years ago
```
am: cc00f4d6

Change-Id: Iece2fd19363a3524746b01cf388566363d678431
```
fa4bbf4a

19 Jul, 2016 16 commits
- Merge changes Id25696e4,I939a12a2 into klp-dev · 77b55262
  Paul Stewart authored 9 years ago
```
* changes:
  Fix string equality comparison
  WifiEnterpriseConfiguration: Do not print credentials in toString
```
  77b55262
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b55 am:... · 3e4c8a96
  Sungsoo Lim authored 9 years ago
```
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b55 am: 3c979c6a am: 710605dc  -s ours am: 39001043  -s ours am: 6e0cedca am: aa0ad336
am: 407bb6ad  -s ours

Change-Id: I461f779db4fdb5c5f9170c6bb3941c5269d980f2
```
  3e4c8a96
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b55 am:... · 407bb6ad
  Sungsoo Lim authored 9 years ago
```
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b55 am: 3c979c6a am: 710605dc  -s ours am: 39001043  -s ours am: 6e0cedca
am: aa0ad336

Change-Id: I58f0e3ddfb4b5e5289e0d79602747de1dfd0106b
```
  407bb6ad
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56c -s ours... · d1b350ce
  Sungsoo Lim authored 9 years ago
```
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56c  -s ours am: 1ae841f5 am: 82a7ad2b
am: 4e192f9a  -s ours

Change-Id: I074d9e6bf5d08b760fd428eca04d4812899555b0
```
  d1b350ce
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b55 am:... · aa0ad336
  Sungsoo Lim authored 9 years ago
```
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b55 am: 3c979c6a am: 710605dc  -s ours am: 39001043  -s ours
am: 6e0cedca

Change-Id: Icd142cfe2b224c2f1c5c56175b955d9c65fbe195
```
  aa0ad336
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56c -s ours am: 1ae841f5 · 4e192f9a
  Sungsoo Lim authored 9 years ago
```
am: 82a7ad2b

Change-Id: Ifb48dfec4944dfcdcbb1a7d5d36a30732fa058e6
```
  4e192f9a
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7 am: 57aaad81 · a2044118
  Sungsoo Lim authored 9 years ago
```
am: d35b114a  -s ours

Change-Id: I33b922f13d4e9cfb6fdf2764f8e202eb38162e58
```
  a2044118
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b55 am:... · 6e0cedca
  Sungsoo Lim authored 9 years ago
```
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b55 am: 3c979c6a am: 710605dc  -s ours
am: 39001043  -s ours

Change-Id: I552387a6fa24b4c5d913b15990bd22b117a2f0d6
```
  6e0cedca
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7 · d35b114a
  Sungsoo Lim authored 9 years ago
```
am: 57aaad81

Change-Id: I18e439f3f3bcea922ecbde678a24f926a9834698
```
  d35b114a
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56c -s ours · 82a7ad2b
  Sungsoo Lim authored 9 years ago
```
am: 1ae841f5

Change-Id: I29059c5695717a1074ac068e613cce11ad78e9ad
```
  82a7ad2b
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b55 am: 3c979c6a · 39001043
  Sungsoo Lim authored 9 years ago
```
am: 710605dc  -s ours

Change-Id: I6db9dc2b6da0505dacfcb84f6370d0b2903a3737
```
  39001043
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b55 · 710605dc
  Sungsoo Lim authored 9 years ago
```
am: 3c979c6a

Change-Id: I1c11953ad5b8f3c14b77f1af12e572f04457a06b
```
  710605dc
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface · 1ae841f5
  Sungsoo Lim authored 9 years ago
```
am: 9fffc56c  -s ours

Change-Id: I97b8ce62b29aa41c0eee2a9dc7a1bb9985525c96
```
  1ae841f5
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface · 57aaad81
  Sungsoo Lim authored 9 years ago
```
am: 3261c5f7

Change-Id: If30d5ca6ebdc2e81ea2206c321940a32998b5d78
```
  57aaad81
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface · 3c979c6a
  Sungsoo Lim authored 9 years ago
```
am: 8dbf0b55

Change-Id: I451adfa75a6a95decbc4e16f50319fea50edbbed
```
  3c979c6a
- Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface" into mnc-dev · f4710c17
  Sungsoo Lim authored 9 years ago
  
  f4710c17
18 Jul, 2016 1 commit
- DO NOT MERGE: Remove the use of JHEAD in ExifInterface · 98287a6d
  Sungsoo Lim authored 9 years ago
```
Bug: 29270469
Change-Id: I6a6c8aeab2a842ff1646316363d614851625e78f
```
  98287a6d