200823 Commits

Author SHA1 Message Date
Sungsoo Lim
25782fae9b DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours
am: 0bbdc37b60

Change-Id: If4f25ea9d5a921fb264d67137fc0af05d84e614e
2016-07-29 19:02:55 +00:00
Sungsoo Lim
0bbdc37b60 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8
am: 2df9864b54  -s ours

Change-Id: Ie0bc2aab0856dc6fae328571f5bc5938b43f9f49
2016-07-29 18:56:25 +00:00
Sungsoo Lim
2df9864b54 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99
am: 14abf736c8

Change-Id: I2a35f4853aa450ccc68862c166b6139ce67a1aad
2016-07-29 18:50:25 +00:00
Sungsoo Lim
14abf736c8 DO NOT MERGE: Fix CTS regression
am: 7a92dc9d99

Change-Id: I13605f366810c158d380b11a814da8eac3e4e213
2016-07-29 18:38:07 +00:00
Sungsoo Lim
db9f504522 DO NOT MERGE: Fix CTS regression
am: 90be39c7bb

Change-Id: Ie32ddd18c9342b36b8d989ab4d715b30ff608949
2016-07-29 18:32:49 +00:00
Sungsoo Lim
90be39c7bb DO NOT MERGE: Fix CTS regression
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
2016-07-29 01:02:27 +00:00
Sungsoo Lim
7a92dc9d99 DO NOT MERGE: Fix CTS regression
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
2016-07-29 01:01:49 +00:00
Benjamin Franz
7abd7ba093 Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
am: 3e582390b3

Change-Id: Ibb90e151746d405e1cc8a1eb889ffa91aca35bc8
2016-07-21 10:05:33 +00:00
Benjamin Franz
3e582390b3 Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev 2016-07-21 09:59:42 +00:00
Paul Stewart
a09b6ee165 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e
am: 1e9889d5ac

Change-Id: Ie0bfc4653bfe90335952110b38be2eeee418f98f
2016-07-20 01:19:50 +00:00
Paul Stewart
b3ff6b4437 Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994
am: f8d4c187a3

Change-Id: If6d30364da0246233415bc15a1dda7c297f7bf6b
2016-07-20 01:19:46 +00:00
Paul Stewart
1e9889d5ac Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1
am: 0f9a968c0e

Change-Id: I5ef9b70287cd8b0beaa169f194e7011b8c354454
2016-07-20 01:12:15 +00:00
Paul Stewart
f8d4c187a3 Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772
am: 6245774994

Change-Id: Ib82209c5c6b71f3c47feaa17c346f853288b0131
2016-07-20 01:12:11 +00:00
Paul Stewart
c77f18b2a3 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6
am: d78a14531e

Change-Id: Id37927594f47a5a32b05b15c8e09df0fa4ea9569
2016-07-20 01:11:49 +00:00
Paul Stewart
d78a14531e WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee
am: 701a6c1ed6

Change-Id: I34acfe2e2ab1da2615f5a7107a9879e7491b0857
2016-07-20 01:01:15 +00:00
Paul Stewart
0f9a968c0e Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b
am: bb7439d8a1

Change-Id: I0aa11cbba826189e7e5e4e9196654c4f43157de0
2016-07-20 00:54:33 +00:00
Paul Stewart
6245774994 Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d
am: 5d60d2f772

Change-Id: I1a0651d22571a4dec3b4b6ca97f6b62b930f1cc7
2016-07-20 00:54:27 +00:00
Paul Stewart
701a6c1ed6 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4
am: e41e0064ee

Change-Id: I9582c9327b859c981cb75d6aad52bb5dd1fafe20
2016-07-20 00:54:20 +00:00
Paul Stewart
bb7439d8a1 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26
am: c92e93c47b

Change-Id: I50ca54dc65b61cb2dbb550eb964bd50938595168
2016-07-20 00:45:09 +00:00
Paul Stewart
5d60d2f772 Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b
am: 700c72d01d

Change-Id: I6fc08163a75790e15d05ab952ad4e706a1391916
2016-07-20 00:45:07 +00:00
Paul Stewart
e41e0064ee WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103
am: e2a03026c4

Change-Id: Iba16c43199d5ab238ce129d37519f9c5a7ba2005
2016-07-20 00:45:04 +00:00
Paul Stewart
c92e93c47b Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891
am: 2e85e2ef26

Change-Id: If8a2f4e1fcbb4adf6e2ddef438781fb83de04cc3
2016-07-20 00:37:53 +00:00
Paul Stewart
700c72d01d Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4
am: bf4f010a5b

Change-Id: I7e57c484be20197748c40c80acd987802b43a734
2016-07-20 00:37:50 +00:00
Paul Stewart
e2a03026c4 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9
am: 141477b103

Change-Id: Ie4c9d06d225a2b99ebb4411e4282ea792c67d26b
2016-07-20 00:37:44 +00:00
Paul Stewart
2e85e2ef26 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28
am: 58555ee891

Change-Id: I1032efe65d45995a79572f669cddc5a4cf6131d9
2016-07-20 00:31:29 +00:00
Paul Stewart
bf4f010a5b Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf
am: 3fbe9280a4

Change-Id: Ib3bea7489d319bb94a41f3c8cb0d8ec7e40b14b7
2016-07-20 00:31:22 +00:00
Paul Stewart
141477b103 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6
am: df93deccf9

Change-Id: Iaeae846189a8f5fa38c5da988eec7879300f8ab5
2016-07-20 00:31:15 +00:00
Paul Stewart
58555ee891 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229
am: 2169197e28

Change-Id: I24f2c9f59336454aa071acca44d6aca5b44fda4a
2016-07-20 00:25:20 +00:00
Paul Stewart
3fbe9280a4 Fix string equality comparison am: 1033c6fdbc
am: fdd4fe53cf

Change-Id: Id179c734fc503abea1216e7c6057d4903a17f340
2016-07-20 00:25:17 +00:00
Paul Stewart
df93deccf9 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646
am: fa4bbf4ad6

Change-Id: I3ec1ff70fdfc2fd2aabf22ad1b7b3dad27ad4674
2016-07-20 00:25:14 +00:00
Paul Stewart
2169197e28 Merge changes Id25696e4,I939a12a2 into klp-dev
am: 77b5526229

Change-Id: I07fc88a342c3c6d1594832d0a05dd0734eb48424
2016-07-20 00:17:49 +00:00
Paul Stewart
fdd4fe53cf Fix string equality comparison
am: 1033c6fdbc

Change-Id: I6503cb15fdc0741b6c6c2da9ee14057265f87545
2016-07-20 00:17:47 +00:00
Paul Stewart
fa4bbf4ad6 WifiEnterpriseConfiguration: Do not print credentials in toString
am: cc00f4d646

Change-Id: Iece2fd19363a3524746b01cf388566363d678431
2016-07-20 00:17:43 +00:00
Paul Stewart
77b5526229 Merge changes Id25696e4,I939a12a2 into klp-dev
* changes:
  Fix string equality comparison
  WifiEnterpriseConfiguration: Do not print credentials in toString
2016-07-19 23:59:00 +00:00
Sungsoo Lim
a1f106b558 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53 -s ours
am: 3e4c8a96fa

Change-Id: Ieab0b4aa107ce1471d601ab65051d9ed0ec18e8a
2016-07-19 01:18:25 +00:00
Sungsoo Lim
3e4c8a96fa DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6
am: 407bb6ad53  -s ours

Change-Id: I461f779db4fdb5c5f9170c6bb3941c5269d980f2
2016-07-19 01:12:12 +00:00
Sungsoo Lim
d8f381af5a DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am: 1ae841f508 am: 82a7ad2b09 am: 4e192f9a04 -s ours
am: d1b350ce7d

Change-Id: I2dfbdb7f5b716d2795f883b333c1339c4fd6c0a3
2016-07-19 01:08:17 +00:00
Sungsoo Lim
407bb6ad53 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6
am: aa0ad336b6

Change-Id: I58f0e3ddfb4b5e5289e0d79602747de1dfd0106b
2016-07-19 01:08:02 +00:00
Sungsoo Lim
d1b350ce7d DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am: 1ae841f508 am: 82a7ad2b09
am: 4e192f9a04  -s ours

Change-Id: I074d9e6bf5d08b760fd428eca04d4812899555b0
2016-07-19 00:53:31 +00:00
Sungsoo Lim
aa0ad336b6 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours
am: 6e0cedcaf6

Change-Id: Icd142cfe2b224c2f1c5c56175b955d9c65fbe195
2016-07-19 00:53:30 +00:00
Sungsoo Lim
e8a7640503 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35 -s ours
am: a2044118a5

Change-Id: Iacf1a129eded02dcfe14a13bbcc0b324b462ec4c
2016-07-19 00:53:14 +00:00
Sungsoo Lim
4e192f9a04 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am: 1ae841f508
am: 82a7ad2b09

Change-Id: Ifb48dfec4944dfcdcbb1a7d5d36a30732fa058e6
2016-07-19 00:47:11 +00:00
Sungsoo Lim
a2044118a5 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161
am: d35b114a35  -s ours

Change-Id: I33b922f13d4e9cfb6fdf2764f8e202eb38162e58
2016-07-19 00:46:25 +00:00
Sungsoo Lim
6e0cedcaf6 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours
am: 3900104379  -s ours

Change-Id: I552387a6fa24b4c5d913b15990bd22b117a2f0d6
2016-07-19 00:45:32 +00:00
Sungsoo Lim
d35b114a35 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3
am: 57aaad8161

Change-Id: I18e439f3f3bcea922ecbde678a24f926a9834698
2016-07-19 00:40:46 +00:00
Sungsoo Lim
82a7ad2b09 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours
am: 1ae841f508

Change-Id: I29059c5695717a1074ac068e613cce11ad78e9ad
2016-07-19 00:40:42 +00:00
Sungsoo Lim
3900104379 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6
am: 710605dccf  -s ours

Change-Id: I6db9dc2b6da0505dacfcb84f6370d0b2903a3737
2016-07-19 00:38:08 +00:00
Sungsoo Lim
710605dccf DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558
am: 3c979c6aa6

Change-Id: I1c11953ad5b8f3c14b77f1af12e572f04457a06b
2016-07-19 00:32:38 +00:00
Sungsoo Lim
1ae841f508 DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am: 9fffc56cb1  -s ours

Change-Id: I97b8ce62b29aa41c0eee2a9dc7a1bb9985525c96
2016-07-19 00:32:25 +00:00
Sungsoo Lim
aa85bf99ee Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\" into mnc-dev
am: f4710c174f

Change-Id: Ia8168af573a5aae66b75c11a2c18fd56e8addae3
2016-07-19 00:32:24 +00:00