Kenny Root
ead1bcd9a2
am ef2f97c7: am e14a5ef6: Merge "Use java.util.Objects instead of internal API"
...
* commit 'ef2f97c70e5942f390daf8e227eafa44ea675f09':
Use java.util.Objects instead of internal API
2013-12-13 22:01:13 +00:00
Kenny Root
ef2f97c70e
am e14a5ef6: Merge "Use java.util.Objects instead of internal API"
...
* commit 'e14a5ef660ebc65cad53c1e108c99d9fd98a4696':
Use java.util.Objects instead of internal API
2013-12-13 13:58:59 -08:00
Kenny Root
e14a5ef660
Merge "Use java.util.Objects instead of internal API"
2013-12-13 21:51:30 +00:00
Kenny Root
7440dde808
Use java.util.Objects instead of internal API
...
Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
2013-12-13 13:28:33 -08:00
Baligh Uddin
02dd4a20e9
am f4f14efc: (-s ours) am 5fcebc78: (-s ours) am 879cc42f: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f4f14efc79b82b7f99d311ae59ec394d60ae81c1':
Import translations. DO NOT MERGE
2013-12-12 16:44:02 +00:00
Baligh Uddin
f4f14efc79
am 5fcebc78: (-s ours) am 879cc42f: (-s ours) Import translations. DO NOT MERGE
...
* commit '5fcebc78b9f6a05ac661dba25acbd354981e9168':
Import translations. DO NOT MERGE
2013-12-12 08:40:48 -08:00
Baligh Uddin
5fcebc78b9
am 879cc42f: (-s ours) Import translations. DO NOT MERGE
...
* commit '879cc42fb33f717f985e4627355c7735c78f16b3':
Import translations. DO NOT MERGE
2013-12-12 07:46:25 -08:00
Baligh Uddin
879cc42fb3
Import translations. DO NOT MERGE
...
Change-Id: I653a48c8fe5951d7987fc807befc343913ae11f3
Auto-generated-cl: translation import
2013-12-11 20:01:51 -08:00
Baligh Uddin
ebadadc8a4
am b69795b6: (-s ours) am c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b69795b6f6a7a33fe20c2e6b06ef4be454ccdf98':
Import translations. DO NOT MERGE
2013-12-09 20:17:15 +00:00
Baligh Uddin
b69795b6f6
am c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c5e0893521593aaa7dc7089eeaf4f14eac07dad7':
Import translations. DO NOT MERGE
2013-12-09 12:13:46 -08:00
Baligh Uddin
c5e0893521
am 233d666a: (-s ours) Import translations. DO NOT MERGE
...
* commit '233d666aee25e8a869fa923e1578ca4ff0a202e2':
Import translations. DO NOT MERGE
2013-12-09 12:10:52 -08:00
Baligh Uddin
233d666aee
Import translations. DO NOT MERGE
...
Change-Id: I6e55230f7b85d2e90578617e879802d6d40eb6d2
Auto-generated-cl: translation import
2013-12-09 11:47:45 -08:00
The Android Open Source Project
65245b94f3
am 9cadf8b1: am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD
...
* commit '9cadf8b10dee1e4dae9decb4f14f8d11f569eaa4':
2013-12-06 01:33:54 +00:00
The Android Open Source Project
9cadf8b10d
am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD
...
* commit 'b568548747c9b137d7da05fcdbb84f157273b3db':
2013-12-05 17:25:39 -08:00
The Android Open Source Project
b568548747
Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD
2013-12-05 12:38:23 -08:00
Lance Jin-woong Chang
76cd835e76
am e161f873: am 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
...
* commit 'e161f8733e816ac83e5d6823d5e958372395e94b':
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
2013-12-05 01:43:56 +00:00
Lance Jin-woong Chang
e161f8733e
am 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
...
* commit '1f5e66392e4fa01d2686a06044a8f0edfda6310f':
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
2013-12-04 17:40:17 -08:00
Lance Chang
31507e290d
am 6d039786: am 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
...
* commit '6d0397864a1933a869553f500fa09536bbcb3c52':
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-05 01:31:51 +00:00
Lance Jin-woong Chang
1f5e66392e
am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
...
* commit '5d65a47c395918d3f777d99747eb4f2e901566ee':
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
2013-12-04 17:29:27 -08:00
Lance Chang
6d0397864a
am 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
...
* commit '0ea2229b4b39146ed41b99ca0542c73e5305d059':
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-04 17:28:36 -08:00
Lance Jin-woong Chang
5d65a47c39
Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
2013-12-05 01:27:46 +00:00
Lance Jin-woong Chang
0637c1f909
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
...
This reverts commit 5796dad9a4
2013-12-05 00:59:51 +00:00
Lance Chang
0ea2229b4b
am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
...
* commit '071fbfd3f35c01fb1c4052614902dabe16af691f':
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-04 16:49:45 -08:00
Lance Chang
071fbfd3f3
Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
2013-12-05 00:47:16 +00:00
Geoff Mendal
056a3ff646
am bc3c36da: (-s ours) am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bc3c36da789d828e77a9d8baa2211712fe077a47':
Import translations. DO NOT MERGE
2013-12-04 21:50:43 +00:00
Geoff Mendal
bc3c36da78
am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE
...
* commit '65c2a2850526802c542ac5a1dee26eab41c33ec3':
Import translations. DO NOT MERGE
2013-12-04 13:45:17 -08:00
Geoff Mendal
65c2a28505
am 3c29831e: (-s ours) Import translations. DO NOT MERGE
...
* commit '3c29831e87bb131246e88aeb2b18d1fc11627e5d':
Import translations. DO NOT MERGE
2013-12-04 13:42:04 -08:00
Geoff Mendal
3c29831e87
Import translations. DO NOT MERGE
...
Change-Id: I4082ee8a0e0fe74e5328bd304f44cab57d4f40cb
Auto-generated-cl: translation import
2013-12-04 13:28:51 -08:00
Amith Yamasani
5ae0b304a9
am ff0fad2a: am e10f8528: Merge "Fix switching running/cached apps with memory bar"
...
* commit 'ff0fad2a0623d29536653f5be13009358fa68fab':
Fix switching running/cached apps with memory bar
2013-12-04 21:09:02 +00:00
Amith Yamasani
1cbb539668
am 95dd34b4: am f67aa398: Merge "Wrong referring to the resource - id/android:id"
...
* commit '95dd34b4e4570b832b6ae3c028fc448365389298':
Wrong referring to the resource - id/android:id
2013-12-04 21:09:01 +00:00
Amith Yamasani
ff0fad2a06
am e10f8528: Merge "Fix switching running/cached apps with memory bar"
...
* commit 'e10f8528220fc4506ff6deee5c71ddab3da5e21d':
Fix switching running/cached apps with memory bar
2013-12-04 13:05:17 -08:00
Amith Yamasani
95dd34b4e4
am f67aa398: Merge "Wrong referring to the resource - id/android:id"
...
* commit 'f67aa3985d36cace1fbea2537bcdc97f8b6d81ef':
Wrong referring to the resource - id/android:id
2013-12-04 13:05:16 -08:00
Amith Yamasani
e10f852822
Merge "Fix switching running/cached apps with memory bar"
2013-12-04 19:17:33 +00:00
Amith Yamasani
f67aa3985d
Merge "Wrong referring to the resource - id/android:id"
2013-12-04 19:05:29 +00:00
Amith Yamasani
e6e80b195b
am ab747c87: am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
...
* commit 'ab747c87a94648cb703f797e4a206b9ef9042772':
Put fragment in specific activity's whitelist
2013-12-03 19:42:24 +00:00
Amith Yamasani
ab747c87a9
am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
...
* commit '3d6ca11349f0ff2b53f4058731da9e904db2c938':
Put fragment in specific activity's whitelist
2013-12-03 11:38:00 -08:00
Amith Yamasani
3d6ca11349
am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
...
* commit '72a7afb0935264586c821062279d39d8338b1e3d':
Put fragment in specific activity's whitelist
2013-12-03 11:35:14 -08:00
Amith Yamasani
72a7afb093
Merge "Put fragment in specific activity's whitelist" into klp-dev
2013-12-03 19:33:21 +00:00
Lance Chang
5796dad9a4
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change
...
Bug: 11923434
Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-03 19:16:12 +09:00
Geoff Mendal
c07afc7eab
am 9d229638: (-s ours) am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE
...
* commit '9d229638eb78fc25a2699fde5ca2f50eeec57040':
Import translations. DO NOT MERGE
2013-12-02 20:51:47 +00:00
Geoff Mendal
9d229638eb
am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd6ea675c11285c02a625d59a8d88270649da6a5f':
Import translations. DO NOT MERGE
2013-12-02 12:48:22 -08:00
Geoff Mendal
d6ea675c11
am f8e1829c: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f8e1829c99f1ad74131dad12e220b95a629cd9b5':
Import translations. DO NOT MERGE
2013-12-02 12:45:29 -08:00
Geoff Mendal
f8e1829c99
Import translations. DO NOT MERGE
...
Change-Id: I64dae5dfac03e30738558bddc4d44867c2e2b52b
Auto-generated-cl: translation import
2013-12-02 12:13:18 -08:00
Geoff Mendal
0cf4329dbe
am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
...
* commit '6bb8844acd5767999a03ae3217a79a7e3be8251b':
Import translations. DO NOT MERGE
2013-11-27 20:42:52 +00:00
Geoff Mendal
6bb8844acd
am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fa1df42735a7d0ef98a2c1d69d9fbe41be9d73d9':
Import translations. DO NOT MERGE
2013-11-27 12:39:48 -08:00
Geoff Mendal
fa1df42735
am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b8fe3aa2abbf106bb1bb1d651cc59e425309d788':
Import translations. DO NOT MERGE
2013-11-27 12:36:00 -08:00
Geoff Mendal
b8fe3aa2ab
Import translations. DO NOT MERGE
...
Change-Id: Ie6abf3e15ab0bdf9c7fcf7fef498a4c23298c653
Auto-generated-cl: translation import
2013-11-27 12:18:28 -08:00
Lorenzo Colitti
5613086bdb
am 540d26e8: Merge "Dynamically update connectivity and IP address."
...
* commit '540d26e8449159ebc2d84b8062f20ab4c6337f77':
Dynamically update connectivity and IP address.
2013-11-26 08:38:50 -08:00
Lorenzo Colitti
d393e7cbab
am 20ab234f: Merge "Cache preferences and services in status dialog."
...
* commit '20ab234f3d8ecdcbae2c998ded48ebf022ffa963':
Cache preferences and services in status dialog.
2013-11-26 08:38:49 -08:00
Ivan Kovac
14c81b48f7
Wrong referring to the resource - id/android:id
...
We were referring to the resource defined as
@+android:id with R.id. which is wrong. This
fix changes the @+android:id/ to @+id/
Change-Id: Ifdca7347bff31311c9c07aecdb110946e4a239ed
2013-11-26 12:42:24 +01:00
