Felipe Leme
|
cbb7bc1511
|
Merge "Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev am: daf9b2ee15" into oc-mr1-dev-plus-aosp
am: 606f2d1b93
Change-Id: I704f41d28f27c6c1559ab778cd49c35169995fc5
|
2017-09-18 20:37:44 +00:00 |
|
Bill Yi
|
02ca638f7f
|
Import translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours am: 456c147827 -s ours am: c49cdb6749 -s ours am: d65cbc4442 -s ours
am: 46d9bb98d5 -s ours
Change-Id: Id1d57e614d56ba6829950e83f2243dd44b304925
|
2017-09-18 20:33:28 +00:00 |
|
TreeHugger Robot
|
2698b8c5a9
|
Merge "[RefactoredBMS] Correct scope of "disabled?" check viz backup/restore decisions"
|
2017-09-18 20:30:53 +00:00 |
|
TreeHugger Robot
|
48bee79fb1
|
Merge "Import translations. DO NOT MERGE"
|
2017-09-18 20:21:31 +00:00 |
|
Android Build Merger (Role)
|
606f2d1b93
|
Merge "Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev am: daf9b2ee15" into oc-mr1-dev-plus-aosp
|
2017-09-18 20:19:10 +00:00 |
|
Felipe Leme
|
3cabdc8880
|
Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev
am: daf9b2ee15
Change-Id: I5fa55acdf7b8328be82410144155ee019d096c2d
|
2017-09-18 20:17:37 +00:00 |
|
Eino-Ville Talvala
|
20ed207f70
|
Merge "DngCreator: Don't use default locale for writing date/time into DNG" into oc-mr1-dev am: 7c1f9cd750
am: 6e70e977df
Change-Id: I5d482de95a494d73667a6abbea42bf3f5e29c8aa
|
2017-09-18 20:17:20 +00:00 |
|
Bill Yi
|
46d9bb98d5
|
Import translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours am: 456c147827 -s ours am: c49cdb6749 -s ours
am: d65cbc4442 -s ours
Change-Id: I188322b3a1efdb1dea4fbe3b85f2d749ffffbe45
|
2017-09-18 20:16:10 +00:00 |
|
TreeHugger Robot
|
4c0d7aa376
|
Merge "Import translations. DO NOT MERGE"
|
2017-09-18 20:07:18 +00:00 |
|
Eino-Ville Talvala
|
6e70e977df
|
Merge "DngCreator: Don't use default locale for writing date/time into DNG" into oc-mr1-dev
am: 7c1f9cd750
Change-Id: I4a8dab62082f80452bf3eb003486e5d0febdd820
|
2017-09-18 20:06:43 +00:00 |
|
Bill Yi
|
d65cbc4442
|
Import translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours am: 456c147827 -s ours
am: c49cdb6749 -s ours
Change-Id: Ief5061ef3933b7e1447e235923a52d741fc8fa7e
|
2017-09-18 20:05:45 +00:00 |
|
Bill Yi
|
c49cdb6749
|
Import translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours
am: 456c147827 -s ours
Change-Id: I029764bb19cc295e4749d8974461f6d6be23d5c2
|
2017-09-18 19:56:59 +00:00 |
|
Bill Yi
|
462392ef6b
|
Merge "Import translations. DO NOT MERGE"
|
2017-09-18 19:48:37 +00:00 |
|
TreeHugger Robot
|
7014cf1971
|
Merge "Import translations. DO NOT MERGE"
|
2017-09-18 19:47:53 +00:00 |
|
TreeHugger Robot
|
802c98dfb8
|
Merge "Import translations. DO NOT MERGE"
|
2017-09-18 19:31:00 +00:00 |
|
TreeHugger Robot
|
45badd3aab
|
Merge "Import translations. DO NOT MERGE"
|
2017-09-18 19:30:26 +00:00 |
|
TreeHugger Robot
|
daf9b2ee15
|
Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev
|
2017-09-18 19:29:46 +00:00 |
|
TreeHugger Robot
|
5a5117b95b
|
Merge "Import translations. DO NOT MERGE"
|
2017-09-18 19:20:43 +00:00 |
|
Bill Yi
|
456c147827
|
Import translations. DO NOT MERGE am: 791ebeed32 -s ours
am: fee3748d04 -s ours
Change-Id: I4d666020e912f122850cc140e3f62d65aea029ca
|
2017-09-18 19:16:08 +00:00 |
|
TreeHugger Robot
|
7c1f9cd750
|
Merge "DngCreator: Don't use default locale for writing date/time into DNG" into oc-mr1-dev
|
2017-09-18 19:10:11 +00:00 |
|
Bill Yi
|
fee3748d04
|
Import translations. DO NOT MERGE
am: 791ebeed32 -s ours
Change-Id: Iff6d60fe8fd1444c88ffa76634a50a4bb377334d
|
2017-09-18 19:09:21 +00:00 |
|
Selim Cinek
|
f66b77b92f
|
Merge "Fixes an issue where the guts could disappear" into oc-mr1-dev am: 6b3501ab91
am: 61282f612d
Change-Id: Icea2de548c1e8a5cd11efa96db446dd13985f5e1
|
2017-09-18 18:54:48 +00:00 |
|
Julia Reynolds
|
664961d53b
|
Merge "Merge "Fix nomanservice notificationrecord leak" into oc-dev am: 9c32669043 -s ours am: beb14f16fd am: c13e51f734" into oc-mr1-dev-plus-aosp
am: d841868feb
Change-Id: Idb571ac087bce60c175b6a54bd52be198bc3c40e
|
2017-09-18 18:51:41 +00:00 |
|
Julia Reynolds
|
6ef3f59a61
|
Merge "Merge "Fix nomanservice notificationrecord leak" into oc-dev am: 9c32669043 -s ours am: beb14f16fd am: b35af33888" into oc-mr1-dev-plus-aosp
am: c1fa919309
Change-Id: I0b976a33fb2347fe9f4cb7c8bfcfdb347172789a
|
2017-09-18 18:47:18 +00:00 |
|
Selim Cinek
|
61282f612d
|
Merge "Fixes an issue where the guts could disappear" into oc-mr1-dev
am: 6b3501ab91
Change-Id: I3011c9437aac2405c35c93df746a7a865256ab48
|
2017-09-18 18:40:09 +00:00 |
|
fionaxu
|
e21e491f0e
|
resolve merge conflicts of 6df58d8da1 to oc-dr1-dev am: 6e40562a73 -s ours am: 0318d4ec91
am: ac5aac788b
Change-Id: I0262866304f69250cbf94862e780c791b14a9fe4
|
2017-09-18 18:36:44 +00:00 |
|
Android Build Merger (Role)
|
d841868feb
|
Merge "Merge "Fix nomanservice notificationrecord leak" into oc-dev am: 9c32669043 -s ours am: beb14f16fd am: c13e51f734" into oc-mr1-dev-plus-aosp
|
2017-09-18 18:33:11 +00:00 |
|
Selim Cinek
|
64c31a374e
|
Merge "Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev am: cf6a6d244e" into oc-mr1-dev-plus-aosp
am: a464532b92
Change-Id: Ifa801951b0d4f02567eaab0ce43f1611b2757c74
|
2017-09-18 18:33:02 +00:00 |
|
Julia Reynolds
|
24216b5f3b
|
Merge "Fix nomanservice notificationrecord leak" into oc-dev am: 9c32669043 -s ours am: beb14f16fd
am: c13e51f734
Change-Id: Ibdfe082f03ea9717e9313ca78060b1cc9c50118c
|
2017-09-18 18:29:29 +00:00 |
|
TreeHugger Robot
|
d8eb7c5942
|
Merge "Use 1MB buffer for install cmds"
|
2017-09-18 18:28:51 +00:00 |
|
Android Build Merger (Role)
|
c1fa919309
|
Merge "Merge "Fix nomanservice notificationrecord leak" into oc-dev am: 9c32669043 -s ours am: beb14f16fd am: b35af33888" into oc-mr1-dev-plus-aosp
|
2017-09-18 18:28:48 +00:00 |
|
Julia Reynolds
|
0fec501946
|
Merge "Fix nomanservice notificationrecord leak" into oc-dev am: 9c32669043 -s ours am: beb14f16fd
am: b35af33888
Change-Id: I07fb24843fec304c269c586f29bf4095876bf743
|
2017-09-18 18:27:06 +00:00 |
|
fionaxu
|
ac5aac788b
|
resolve merge conflicts of 6df58d8da1 to oc-dr1-dev am: 6e40562a73 -s ours
am: 0318d4ec91
Change-Id: I78ec7783d47fd5a72c192018e75c0c36fb1a6cdb
|
2017-09-18 18:25:27 +00:00 |
|
Selim Cinek
|
6b3501ab91
|
Merge "Fixes an issue where the guts could disappear" into oc-mr1-dev
|
2017-09-18 18:24:50 +00:00 |
|
fionaxu
|
38bd64363e
|
resolve merge conflicts of 6df58d8da1 to oc-dr1-dev am: 6e40562a73 am: 1a7379d788
am: be4e433da2
Change-Id: I038f4503d1dd449c48c61785619db57e089519d7
|
2017-09-18 18:22:55 +00:00 |
|
Android Build Merger (Role)
|
a464532b92
|
Merge "Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev am: cf6a6d244e" into oc-mr1-dev-plus-aosp
|
2017-09-18 18:19:52 +00:00 |
|
Julia Reynolds
|
c13e51f734
|
Merge "Fix nomanservice notificationrecord leak" into oc-dev am: 9c32669043 -s ours
am: beb14f16fd
Change-Id: Icd720ef0e675473039613fe2f77789735f8c559e
|
2017-09-18 18:19:17 +00:00 |
|
Selim Cinek
|
133324dfa2
|
Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev
am: cf6a6d244e
Change-Id: Ic3ac8d59c56cec95357bbecafa60d2228810e61c
|
2017-09-18 18:17:14 +00:00 |
|
Julia Reynolds
|
b35af33888
|
Merge "Fix nomanservice notificationrecord leak" into oc-dev am: 9c32669043 -s ours
am: beb14f16fd
Change-Id: I4389c9502a6b8dd0224ec4323bbbe2599133de15
|
2017-09-18 18:16:38 +00:00 |
|
fionaxu
|
be4e433da2
|
resolve merge conflicts of 6df58d8da1 to oc-dr1-dev am: 6e40562a73
am: 1a7379d788
Change-Id: I7c3afba872aa8bcc13c5bbe39f91e50a3c02efe1
|
2017-09-18 18:14:50 +00:00 |
|
Ruina Liu
|
c59951dc28
|
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am: ac421b8f44 am: 8c65620d31 am: 311d031d22
am: 57a1d7a669
Change-Id: Ia77a11df8f4e4ed64df96b0323c27f8057bd2992
|
2017-09-18 18:13:29 +00:00 |
|
fionaxu
|
0318d4ec91
|
resolve merge conflicts of 6df58d8da1 to oc-dr1-dev
am: 6e40562a73 -s ours
Change-Id: I65b0adc062d2bfc83590b24d04030d01790e5bd7
|
2017-09-18 18:12:24 +00:00 |
|
Julia Reynolds
|
beb14f16fd
|
Merge "Fix nomanservice notificationrecord leak" into oc-dev
am: 9c32669043 -s ours
Change-Id: I890f0e8e36b5c397365af8d9eb7f84d1d9a7a719
|
2017-09-18 18:09:02 +00:00 |
|
Selim Cinek
|
cf6a6d244e
|
Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev
|
2017-09-18 18:08:29 +00:00 |
|
Ruina Liu
|
57a1d7a669
|
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am: ac421b8f44 am: 8c65620d31
am: 311d031d22
Change-Id: I151f0dc74bfeca44db6aa0c428f8cfbb8b2d3891
|
2017-09-18 18:06:30 +00:00 |
|
fionaxu
|
1a7379d788
|
resolve merge conflicts of 6df58d8da1 to oc-dr1-dev
am: 6e40562a73
Change-Id: I804a1cebba2b8fb297bd8dda9a74ae8736334e3b
|
2017-09-18 18:06:26 +00:00 |
|
Ruina Liu
|
311d031d22
|
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am: ac421b8f44
am: 8c65620d31
Change-Id: I70ded26f7487e0cf0cbb2f3fa1184c85ed00b765
|
2017-09-18 18:00:58 +00:00 |
|
fionaxu
|
6e40562a73
|
resolve merge conflicts of 6df58d8da1 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: 65113738
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa
|
2017-09-18 17:57:45 +00:00 |
|
Ruina Liu
|
8c65620d31
|
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
am: ac421b8f44
Change-Id: I9c6b453e0ef71a70cd972a47763d042943fe3f36
|
2017-09-18 17:53:31 +00:00 |
|
Treehugger Robot
|
ac421b8f44
|
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
|
2017-09-18 17:37:26 +00:00 |
|