Anthony Lee
|
351e982e23
|
am fb120f7c: am dc952e5d: am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f
* commit 'fb120f7c2663a58ec12daf06563b1d27add19e94':
b/17209397. NOOP getServiceMap() if we are in the tombstone app.
|
2014-11-02 17:44:13 +00:00 |
|
Jin Cao
|
b9f425614d
|
am 5b366acf: am ac026ecb: am 0d2f843d: Remove getSuggestionsAuthority automerge: 65c2179
* commit '5b366acf0c6b02fc22af494bf244a490c71e8005':
Remove getSuggestionsAuthority
|
2014-11-02 17:44:11 +00:00 |
|
Jin Cao
|
292cf3904d
|
am d0a67be9: am a357f81e: am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
* commit 'd0a67be95098394fbb3fe7a05b13c9e432caff3b':
Remove default search for Email
|
2014-11-02 17:44:10 +00:00 |
|
Tony Mantler
|
544b00f009
|
am 5a33a789: am c48b9669: am 65bf9945: Fix search mailbox status on early-out when searching automerge: 207a35f
* commit '5a33a7899b9c152c4783ad4b8725d7c7736212f0':
Fix search mailbox status on early-out when searching
|
2014-11-02 17:44:09 +00:00 |
|
Tony Mantler
|
066c3202dc
|
am 89a36e1d: am ea73ce47: am c71afebb: Fix some AOSP NPEs automerge: 473ce1f
* commit '89a36e1d44249c40420a710336f7eb5fa376b722':
Fix some AOSP NPEs
|
2014-11-02 17:44:08 +00:00 |
|
Anthony Lee
|
140784ce88
|
am 61a99bbb: am 4f5e86fc: am 982394da: Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df
* commit '61a99bbb3bcd64253dc988ab99db9ff49d903d3f':
b/17193866. Update policies when we reconcile.
|
2014-11-02 17:44:06 +00:00 |
|
Baligh Uddin
|
ce660a6ebb
|
am e19bbf38: (-s ours) am ee7eda0c: (-s ours) am 7e1932f7: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours
* commit 'e19bbf3815b3f244f7ebee58ccc1371deca83d13':
Import translations. DO NOT MERGE
|
2014-11-02 17:44:05 +00:00 |
|
Tony Mantler
|
ae99756ff0
|
am 65911dc2: am 831bb0ab: am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b
* commit '65911dc2d2ecb08c7f40e203e8268dc91afc0388':
Match dup accounts against all accounts, not just Email
|
2014-11-02 17:44:04 +00:00 |
|
Anthony Lee
|
32c3580aee
|
am 4ae25d3b: am ca31da91: am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50
* commit '4ae25d3b4510f3c02709090fb0c6ddf64730ddad':
b/17135753. Make sure to free ServiceConnection.
|
2014-11-02 17:44:01 +00:00 |
|
Andrew Sapperstein
|
e80fb6cefe
|
am ad1137d1: am ecb6fc31: am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013
* commit 'ad1137d1e68b923d310423c66b73c75bb19d6345':
Use appcompat photoviewer.
|
2014-11-02 17:44:00 +00:00 |
|
Tony Mantler
|
87ff47b6ac
|
am 49c8521d: am 214cf5cf: am e34c3677: Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a
* commit '49c8521dbb1415318b5ebbe48e2c72d893c815b9':
Drawer resource updates
Update Notifications (Email)
|
2014-11-02 17:43:58 +00:00 |
|
Anthony Lee
|
fb120f7c26
|
am dc952e5d: am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f
* commit 'dc952e5d93c8186de382af1c1912c7bfe04d091d':
b/17209397. NOOP getServiceMap() if we are in the tombstone app.
|
2014-11-02 17:36:56 +00:00 |
|
Jin Cao
|
5b366acf0c
|
am ac026ecb: am 0d2f843d: Remove getSuggestionsAuthority automerge: 65c2179
* commit 'ac026ecb5119d5609aa463a286ac286dbd63c381':
Remove getSuggestionsAuthority
|
2014-11-02 17:36:55 +00:00 |
|
Jin Cao
|
d0a67be950
|
am a357f81e: am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
* commit 'a357f81eb91a54114252e84fa798c2a5c8eb90e8':
Remove default search for Email
|
2014-11-02 17:36:53 +00:00 |
|
Tony Mantler
|
5a33a7899b
|
am c48b9669: am 65bf9945: Fix search mailbox status on early-out when searching automerge: 207a35f
* commit 'c48b966988aec07805a13e3b90f45f350a479221':
Fix search mailbox status on early-out when searching
|
2014-11-02 17:36:51 +00:00 |
|
Tony Mantler
|
89a36e1d44
|
am ea73ce47: am c71afebb: Fix some AOSP NPEs automerge: 473ce1f
* commit 'ea73ce4730be9a73a19291f7b2e246c0e145b1eb':
Fix some AOSP NPEs
|
2014-11-02 17:36:50 +00:00 |
|
Anthony Lee
|
61a99bbb3b
|
am 4f5e86fc: am 982394da: Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df
* commit '4f5e86fc809f5a65cdac562b31499e54ad09a2a3':
b/17193866. Update policies when we reconcile.
|
2014-11-02 17:36:48 +00:00 |
|
Baligh Uddin
|
e19bbf3815
|
am ee7eda0c: (-s ours) am 7e1932f7: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours
* commit 'ee7eda0c6efad5a0fb83949496ea771d6a8ef2b6':
Import translations. DO NOT MERGE
|
2014-11-02 17:36:47 +00:00 |
|
Tony Mantler
|
65911dc2d2
|
am 831bb0ab: am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b
* commit '831bb0abfea4974d7ab10876117a1524088a2a96':
Match dup accounts against all accounts, not just Email
|
2014-11-02 17:36:46 +00:00 |
|
Anthony Lee
|
4ae25d3b45
|
am ca31da91: am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50
* commit 'ca31da91c8b844fc89595a055ccf08452f8273ee':
b/17135753. Make sure to free ServiceConnection.
|
2014-11-02 17:36:44 +00:00 |
|
Andrew Sapperstein
|
ad1137d1e6
|
am ecb6fc31: am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013
* commit 'ecb6fc314fb15a334ea9362e73a8cb701eca6cf0':
Use appcompat photoviewer.
|
2014-11-02 17:36:43 +00:00 |
|
Tony Mantler
|
49c8521dbb
|
am 214cf5cf: am e34c3677: Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a
* commit '214cf5cf93513a1f5ef26851774aa9bc038f1ccb':
Drawer resource updates
Update Notifications (Email)
|
2014-11-02 17:36:42 +00:00 |
|
Anthony Lee
|
dc952e5d93
|
am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f
* commit '7ef664233b990129f83bf817206b030cc362fc1e':
b/17209397. NOOP getServiceMap() if we are in the tombstone app.
|
2014-11-02 17:28:53 +00:00 |
|
Jin Cao
|
ac026ecb51
|
am 0d2f843d: Remove getSuggestionsAuthority automerge: 65c2179
* commit '0d2f843d897d688d94817476d1087f3d6170e59e':
Remove getSuggestionsAuthority
|
2014-11-02 17:28:25 +00:00 |
|
Jin Cao
|
a357f81eb9
|
am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
* commit '1991e2a93710f6f04e237f0d881365c3aa42d162':
Remove default search for Email
|
2014-11-02 17:28:23 +00:00 |
|
Tony Mantler
|
c48b966988
|
am 65bf9945: Fix search mailbox status on early-out when searching automerge: 207a35f
* commit '65bf9945341a0a39066e629472ed76864c6337d9':
Fix search mailbox status on early-out when searching
|
2014-11-02 17:28:22 +00:00 |
|
Tony Mantler
|
ea73ce4730
|
am c71afebb: Fix some AOSP NPEs automerge: 473ce1f
* commit 'c71afebb39b16f7384f096b9d50341f4f0bf25da':
Fix some AOSP NPEs
|
2014-11-02 17:28:20 +00:00 |
|
Anthony Lee
|
4f5e86fc80
|
am 982394da: Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df
* commit '982394da32883a6c0518b8a627a73174183a1766':
b/17193866. Update policies when we reconcile.
|
2014-11-02 17:28:19 +00:00 |
|
Baligh Uddin
|
ee7eda0c6e
|
am 7e1932f7: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours
* commit '7e1932f72774f92d1646043f1c5bf75dd72c9c92':
Import translations. DO NOT MERGE
|
2014-11-02 17:28:18 +00:00 |
|
Tony Mantler
|
831bb0abfe
|
am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b
* commit 'b043233486ab845291d76aa9878378cd1e3368b1':
Match dup accounts against all accounts, not just Email
|
2014-11-02 17:27:54 +00:00 |
|
Anthony Lee
|
ca31da91c8
|
am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50
* commit '9d1dc78916b56d47a907a3ffa7fbd2375bb503a4':
b/17135753. Make sure to free ServiceConnection.
|
2014-11-02 17:27:53 +00:00 |
|
Andrew Sapperstein
|
ecb6fc314f
|
am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013
* commit '69dda4803ad5ddd1b436f84c9a29876f7baae097':
Use appcompat photoviewer.
|
2014-11-02 17:27:52 +00:00 |
|
Tony Mantler
|
214cf5cf93
|
am e34c3677: Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a
* commit 'e34c3677b429a935ac20443ae45136c49f62ca2f':
Drawer resource updates
Update Notifications (Email)
|
2014-11-02 17:27:51 +00:00 |
|
Anthony Lee
|
7ef664233b
|
b/17209397. NOOP getServiceMap() if we are in the tombstone app.
automerge: 0397e7f
* commit '0397e7fb233bbf76f7ea30ab3e447f74d7c6bcce':
b/17209397. NOOP getServiceMap() if we are in the tombstone app.
|
2014-11-02 07:12:31 +00:00 |
|
Jin Cao
|
0d2f843d89
|
Remove getSuggestionsAuthority
automerge: 65c2179
* commit '65c217943a13f42878f6d8a37475afbef1631472':
Remove getSuggestionsAuthority
|
2014-11-02 07:09:42 +00:00 |
|
Jin Cao
|
1991e2a937
|
Merge "Remove default search for Email" into ub-gmail-ur14-dev
automerge: 9ac6ec7
* commit '9ac6ec72855980d4f79140bf17bc2c96c10d5b45':
Remove default search for Email
|
2014-11-02 07:09:35 +00:00 |
|
Tony Mantler
|
65bf994534
|
Fix search mailbox status on early-out when searching
automerge: 207a35f
* commit '207a35f174a1004c6431b2e336d9ff29db47d0f5':
Fix search mailbox status on early-out when searching
|
2014-11-02 07:09:28 +00:00 |
|
Tony Mantler
|
c71afebb39
|
Fix some AOSP NPEs
automerge: 473ce1f
* commit '473ce1fa354c81fd7d5bbd84b6a85d629a039e72':
Fix some AOSP NPEs
|
2014-11-02 07:09:21 +00:00 |
|
Anthony Lee
|
982394da32
|
Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev
automerge: 355e9df
* commit '355e9dffc35fa9b3084a7f49ff985427fda2ea06':
b/17193866. Update policies when we reconcile.
|
2014-11-02 07:09:06 +00:00 |
|
Baligh Uddin
|
7e1932f727
|
Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
automerge: 67995a4 -s ours
* commit '67995a417aad0ac733229305542f84882d7af0b3':
Import translations. DO NOT MERGE
|
2014-11-02 07:08:52 +00:00 |
|
Tony Mantler
|
b043233486
|
Match dup accounts against all accounts, not just Email
automerge: c1a760b
* commit 'c1a760bf3609ee4d6bd7de0d78e1c6e2ffa151b1':
Match dup accounts against all accounts, not just Email
|
2014-11-02 07:07:43 +00:00 |
|
Anthony Lee
|
9d1dc78916
|
b/17135753. Make sure to free ServiceConnection.
automerge: 8c65e50
* commit '8c65e50bfe3b90b96985c2d87b8c459c348af6aa':
b/17135753. Make sure to free ServiceConnection.
|
2014-11-02 07:06:41 +00:00 |
|
Andrew Sapperstein
|
69dda4803a
|
Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev
automerge: b042013
* commit 'b04201335cf33bded97e9019940e0b8f9ccfb6d9':
Use appcompat photoviewer.
|
2014-11-02 07:06:06 +00:00 |
|
Tony Mantler
|
e34c3677b4
|
Merge "Drawer resource updates" into ub-gmail-ur14-dev
automerge: 1e6f26a
* commit '1e6f26af804d32e4780599481a6e11152756348f':
Drawer resource updates
Update Notifications (Email)
|
2014-11-02 07:04:54 +00:00 |
|
Baligh Uddin
|
cdd28c1e93
|
am f44b729b: (-s ours) Import translations. DO NOT MERGE
* commit 'f44b729bff619d0a9f0b1492726351e41c1e5d5d':
Import translations. DO NOT MERGE
|
2014-10-31 17:20:38 +00:00 |
|
Baligh Uddin
|
f44b729bff
|
Import translations. DO NOT MERGE
Change-Id: Iee475d633f006f42885e481ed819ac8cb2c86420
Auto-generated-cl: translation import
|
2014-10-30 15:50:02 -07:00 |
|
Baligh Uddin
|
ea349b6581
|
am b9afdc21: (-s ours) am 4b6f2e7a: (-s ours) Import translations. DO NOT MERGE
* commit 'b9afdc2125f5a9838d92248bead8209926f8e314':
|
2014-10-27 18:50:37 +00:00 |
|
Baligh Uddin
|
ef7eb2a704
|
am edbb115e: (-s ours) am bf868306: (-s ours) Import translations. DO NOT MERGE
* commit 'edbb115ef332bd270240526882f62774ca90323f':
|
2014-10-27 18:50:36 +00:00 |
|
Baligh Uddin
|
01fe491bb1
|
am 622f32f7: (-s ours) am 3b78a310: (-s ours) am 7fd70814: (-s ours) am 4b6f2e7a: (-s ours) Import translations. DO NOT MERGE
* commit '622f32f71766173660ba01aede507cc5ae257fce':
Import translations. DO NOT MERGE
|
2014-10-20 00:44:40 +00:00 |
|
Baligh Uddin
|
622f32f717
|
am 3b78a310: (-s ours) am 7fd70814: (-s ours) am 4b6f2e7a: (-s ours) Import translations. DO NOT MERGE
* commit '3b78a3105969eae98ecc34cbb7eef7f6b6c858e3':
Import translations. DO NOT MERGE
|
2014-10-20 00:39:15 +00:00 |
|