The Android Automerger
191f518f63
merge in master-release history after reset to 2b5156c427
2014-05-19 05:50:07 -07:00
The Android Automerger
8bd1488acf
merge in master-release history after reset to 2b5156c427
2014-05-18 05:50:05 -07:00
The Android Automerger
e00b17059e
merge in master-release history after reset to 2b5156c427
2014-05-17 05:51:28 -07:00
The Android Automerger
32d7cd490b
merge in master-release history after reset to 2b5156c427
2014-05-15 05:51:12 -07:00
Tony Mantler
46c591e0f5
Fix URI comparison
...
b/14914981
The framework may make copies of the URI objects before they're passed in,
so we should use .equals() instead of pointer equality.
Change-Id: Ia443e96c81d53829ac6cfce70cebc098861f1c78
(cherry picked from commit e8a3c14f28
2014-05-14 15:15:26 -07:00
Tony Mantler
2b5156c427
Fix URI comparison
...
b/14914981
The framework may make copies of the URI objects before they're passed in,
so we should use .equals() instead of pointer equality.
Change-Id: Ia443e96c81d53829ac6cfce70cebc098861f1c78
(cherry picked from commit e8a3c14f28
2014-05-14 18:34:45 +00:00
The Android Automerger
cab2d2e628
merge in master-release history after reset to cd625781a8
2014-05-14 05:51:14 -07:00
The Android Automerger
3bd1892296
merge in master-release history after reset to c03b358d75
2014-05-13 05:50:54 -07:00
Baligh Uddin
cd625781a8
Import translations. DO NOT MERGE
...
Change-Id: I9be9fd0e620e4b1b740e2b3343bd10783b5656ee
Auto-generated-cl: translation import
2014-05-12 13:24:29 -07:00
The Android Automerger
15caf39b5b
merge in master-release history after reset to c03b358d75
2014-05-12 05:50:00 -07:00
The Android Automerger
d03a96a38e
merge in master-release history after reset to c03b358d75
2014-05-11 05:50:00 -07:00
The Android Automerger
dae400a974
merge in master-release history after reset to c03b358d75
2014-05-10 05:50:56 -07:00
The Android Automerger
bb47bd4f32
merge in master-release history after reset to 6736f1a9fd
2014-05-08 05:50:48 -07:00
Baligh Uddin
c03b358d75
Import translations. DO NOT MERGE
...
Change-Id: Id741559753c13c2b11fa5ddd68690e126e5fefd4
Auto-generated-cl: translation import
2014-05-07 19:32:08 -07:00
The Android Automerger
5813d4df3c
merge in master-release history after reset to 6736f1a9fd
2014-05-07 09:11:27 -07:00
The Android Automerger
a40932d9d0
merge in master-release history after reset to 6736f1a9fd
2014-05-07 05:50:49 -07:00
The Android Automerger
b3e8627ca5
merge in master-release history after reset to 73f1fd0a57
2014-05-06 05:50:43 -07:00
Baligh Uddin
6736f1a9fd
Import translations. DO NOT MERGE
...
Change-Id: I6e94e1bbdd3df23e8a934261d04908c7e97c2ed7
Auto-generated-cl: translation import
2014-05-05 14:14:40 -07:00
The Android Automerger
cd8c2e8297
merge in master-release history after reset to 73f1fd0a57
2014-05-05 05:50:08 -07:00
The Android Automerger
e4de62f009
merge in master-release history after reset to 73f1fd0a57
2014-05-04 05:50:00 -07:00
The Android Automerger
dc85529e82
merge in master-release history after reset to 73f1fd0a57
2014-05-03 05:51:15 -07:00
The Android Automerger
0104e82127
merge in master-release history after reset to 9632caddbd
2014-05-01 05:50:50 -07:00
Baligh Uddin
73f1fd0a57
Import translations. DO NOT MERGE
...
Change-Id: I6d2f3e4bc874c13d1acb79f68bf470c527e606f3
Auto-generated-cl: translation import
2014-04-30 13:52:39 -07:00
The Android Automerger
f47c8cc239
merge in master-release history after reset to 4e7d7a057f
2014-04-30 05:51:06 -07:00
Bill Yi
9632caddbd
am 2ed7ccb0: am 22766dcf: Merge commit \'3d083cfdd24471d58f7e4979265a51ec5b1f6c3f\' into HEAD
...
* commit '2ed7ccb0056490fa60c0511fd256d244d308d69b':
2014-04-30 12:50:17 +00:00
Bill Yi
2ed7ccb005
am 22766dcf: Merge commit \'3d083cfdd24471d58f7e4979265a51ec5b1f6c3f\' into HEAD
...
* commit '22766dcf6a44416b2972c053739472317017257d':
2014-04-30 00:59:33 +00:00
Bill Yi
22766dcf6a
Merge commit '3d083cfdd24471d58f7e4979265a51ec5b1f6c3f' into HEAD
2014-04-29 11:34:24 -07:00
The Android Automerger
7696ee56f5
merge in master-release history after reset to e31bd0ba89
2014-04-29 05:50:52 -07:00
Baligh Uddin
4e7d7a057f
Import translations. DO NOT MERGE
...
Change-Id: Ie49c78b93f2042a5b75d0e54b72057ecf56464f2
Auto-generated-cl: translation import
2014-04-28 13:30:02 -07:00
The Android Automerger
3c551d0c5e
merge in master-release history after reset to e31bd0ba89
2014-04-28 05:49:53 -07:00
The Android Automerger
5c5334e1cc
merge in master-release history after reset to e31bd0ba89
2014-04-27 05:49:57 -07:00
The Android Automerger
9ab39e8836
merge in master-release history after reset to e31bd0ba89
2014-04-26 05:51:36 -07:00
The Android Automerger
b1e73c2e19
merge in master-release history after reset to 671a1f705e
2014-04-24 05:52:14 -07:00
Baligh Uddin
e31bd0ba89
Import translations. DO NOT MERGE
...
Change-Id: I08b2df6758d0b88b695f8c77a44506767e5485b4
Auto-generated-cl: translation import
2014-04-23 15:26:44 -07:00
Baligh Uddin
671a1f705e
am 445d3a51: (-s ours) am 99eedaff: (-s ours) Import translations. DO NOT MERGE
...
* commit '445d3a51bc712b2384cd98eeab0e76444a824518':
Import translations. DO NOT MERGE
2014-04-23 02:25:43 +00:00
Baligh Uddin
445d3a51bc
am 99eedaff: (-s ours) Import translations. DO NOT MERGE
...
* commit '99eedaff4b09c7366ac9eae2110a66141a035a01':
Import translations. DO NOT MERGE
2014-04-23 02:19:11 +00:00
Baligh Uddin
99eedaff4b
Import translations. DO NOT MERGE
...
Change-Id: I715a4aedb86ed305624004746634225e36de074c
Auto-generated-cl: translation import
2014-04-22 18:24:24 -07:00
The Android Automerger
8aca0cd408
merge in master-release history after reset to master
2014-04-17 05:50:17 -07:00
Baligh Uddin
dbfc65b70a
Import translations. DO NOT MERGE
...
Change-Id: Id4148d321f81e996a9fef093643c742d12e17112
Auto-generated-cl: translation import
2014-04-14 13:38:30 -07:00
The Android Automerger
914c7240ca
merge in master-release history after reset to master
2014-04-08 05:50:08 -07:00
Baligh Uddin
eaf4a685d2
am 29fb1636: (-s ours) am d37242da: (-s ours) am 2580aa73: (-s ours) am a6ee741a: (-s ours) Import translations. DO NOT MERGE
...
* commit '29fb1636f8fdfde0433772f5a70ded14b0a091c8':
Import translations. DO NOT MERGE
2014-04-08 02:49:47 +00:00
Baligh Uddin
73a113e832
am e9ccbced: (-s ours) am 3422f03c: (-s ours) am 087d39f7: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e9ccbced8c274eeac4c638b1255483e7c4e68d8d':
Import translations. DO NOT MERGE
2014-04-08 02:42:43 +00:00
Baligh Uddin
29fb1636f8
am d37242da: (-s ours) am 2580aa73: (-s ours) am a6ee741a: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd37242da0324d5cf225362bd1366e76f6e0b782b':
Import translations. DO NOT MERGE
2014-04-08 02:42:36 +00:00
Baligh Uddin
e9ccbced8c
am 3422f03c: (-s ours) am 087d39f7: (-s ours) Import translations. DO NOT MERGE
...
* commit '3422f03cbaf545e8e76309c7dfba573c3b14eabf':
Import translations. DO NOT MERGE
2014-04-08 02:35:30 +00:00
Baligh Uddin
d37242da03
am 2580aa73: (-s ours) am a6ee741a: (-s ours) Import translations. DO NOT MERGE
...
* commit '2580aa73b5f27293c3b37c004487cbfd9bebea95':
Import translations. DO NOT MERGE
2014-04-08 02:35:28 +00:00
Baligh Uddin
5aa6648f98
am 73d4ec2a: (-s ours) am 1b85b57e: (-s ours) Import translations. DO NOT MERGE
...
* commit '73d4ec2ab7958c6b6fc569a287b18d931a7e6f7c':
Import translations. DO NOT MERGE
2014-04-08 02:35:23 +00:00
Baligh Uddin
3422f03cba
am 087d39f7: (-s ours) Import translations. DO NOT MERGE
...
* commit '087d39f73a710e6e4866270daee3b9df030f0e24':
Import translations. DO NOT MERGE
2014-04-08 02:28:31 +00:00
Baligh Uddin
2580aa73b5
am a6ee741a: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a6ee741ad4f428c800d38025887ee526b30de496':
Import translations. DO NOT MERGE
2014-04-08 02:28:31 +00:00
Baligh Uddin
73d4ec2ab7
am 1b85b57e: (-s ours) Import translations. DO NOT MERGE
...
* commit '1b85b57e1310205cdbf5bc48ad1d7d8618ef4fa9':
Import translations. DO NOT MERGE
2014-04-08 02:28:21 +00:00
Baligh Uddin
23e84f5d0a
Import translations. DO NOT MERGE
...
Change-Id: Ic162ae876ba9c933bbb57d35c174c5fb82aa247a
Auto-generated-cl: translation import
2014-04-07 13:10:43 -07:00
