OSDN Git Service
Baligh Uddin [Sun, 6 Jul 2014 18:39:24 +0000 (18:39 +0000)]
am
2ea222e6: (-s ours) am
93360f02: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2ea222e6615cef6977e40b0dbb7b58c2313e6976':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:33:21 +0000 (18:33 +0000)]
am
ab157d74: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
ab157d740ed5c0bff544adc8992d9fce99462707':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:33:17 +0000 (18:33 +0000)]
am
87bcd150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
87bcd150a4122b78e98d3b859869b54e4546405d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:33:12 +0000 (18:33 +0000)]
am
f643d529: (-s ours) am
b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f643d52941be004e14b7edfe3035996475f95028':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:33:08 +0000 (18:33 +0000)]
am
2f689434: (-s ours) am
f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2f6894345691af96d23952146bc3495758f84fbb':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:33:04 +0000 (18:33 +0000)]
am
93360f02: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
93360f022ec67bb994f04f9799bfac32997f0d00':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:33:04 +0000 (18:33 +0000)]
am
6e90b3c0: (-s ours) am
f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
6e90b3c078baa2b6c6398376490b7c540309be70':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:29:03 +0000 (18:29 +0000)]
am
51ad6520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
51ad6520b6d7870dc26d20139cc3a934dfb994f6':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:28:54 +0000 (18:28 +0000)]
am
6b7d2cf7: (-s ours) am
f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
6b7d2cf77d28922a8e81730e2a462aab258dfe68':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:28:50 +0000 (18:28 +0000)]
am
6df13287: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
6df132872faa605304ab9dc488cc589580742a28':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:28:47 +0000 (18:28 +0000)]
am
334c84cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
334c84cfe60cd938317d0a3ee1a47c5cc8331077':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:26:05 +0000 (18:26 +0000)]
am
b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
b4600e793b4b8a4332031d08c5ba5290abe0c71d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:26:01 +0000 (18:26 +0000)]
am
f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f599be53727976c495575e864e1566cfdaf2eee5':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:25:58 +0000 (18:25 +0000)]
am
f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f1c1e725ec44aab7ebc5c4530133b169ddb6f73e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:21:51 +0000 (18:21 +0000)]
am
f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f67d4bafee9ab60912add98ad4ec0697d3e231fc':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:21:15 +0000 (18:21 +0000)]
am
add3fb66: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
add3fb664a7e245caf86facc1855d8b9ce4281be':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:30:06 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 16:30:04 +0000 (09:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I99893089a51a6984d44db22628dccc90b0867faf
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:22:35 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 16:44:21 +0000 (09:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I99d859070b0a2d65c9e57556f7ccc0b4dfb3a995
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:18:46 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 21:00:41 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2898d53a3f6bf4fc920fa8c3bc122d00aa879d18
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:15:48 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:08:28 +0000 (18:08 +0000)]
am
f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f2e29071079ab67d6ed66852f6a6f5d4f1ee8753':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:27 +0000 (18:08 +0000)]
Merge branch 'klp-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:08:20 +0000 (18:08 +0000)]
am
eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
eb17f6ab69ce9dda043c17827351522a8bcc2613':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:17 +0000 (18:08 +0000)]
am
77c61120: (-s ours) Import translations. DO NOT MERGE
* commit '
77c6112089e3fb58189b69f56f14b55a94c6b0da':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 22:40:58 +0000 (15:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7fc09c4e2f022c81a461d7228727ddc84ad6bb96
Auto-generated-cl: translation import
Baligh Uddin [Sat, 5 Jul 2014 21:10:06 +0000 (14:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie1868681bbc06d89a0695863e9146cd2ee85a5de
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:29:14 +0000 (18:29 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 16:35:17 +0000 (09:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I511bc5ac04b62fe85c7306d506af686888a79957
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:19:04 +0000 (18:19 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 17:45:00 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I300f1b8bf139efb93c8a7c0d0f5ad8b77a4c2d42
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:19:01 +0000 (18:19 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Sun, 6 Jul 2014 18:13:04 +0000 (18:13 +0000)]
am
fd5e4617: (-s ours) am
f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
fd5e46171db33fc2f5dcb6fbfbb6b19e36e9b485':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:12:41 +0000 (18:12 +0000)]
am
026d5d21: Merge branch \'klp-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev
* commit '
026d5d21e1de6ba1a085059bb9a6c959690dc994':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:12:38 +0000 (18:12 +0000)]
am
e885a9ca: (-s ours) am
eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e885a9ca9b54aec74dc78de1fab0f2efeb910046':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:12:35 +0000 (18:12 +0000)]
am
57a85cee: (-s ours) am
77c61120: (-s ours) Import translations. DO NOT MERGE
* commit '
57a85ceed620a2c13dfddfbe702a1baee0076343':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:20 +0000 (18:08 +0000)]
am
b84a800c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
b84a800c173d6f6690568b59be0708c8dcb9fb4d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:16 +0000 (18:08 +0000)]
am
562d8cc7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
562d8cc7bc203a03ed20f1dbf25ef5f3f80c4705':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:13 +0000 (18:08 +0000)]
am
f617f4d0: (-s ours) Import translations. DO NOT MERGE
* commit '
f617f4d074886949f48e0f1c507f76d917a7f2b2':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 22:42:53 +0000 (15:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia07b3b246f397eda9216449403dd283e02f69c42
Auto-generated-cl: translation import
Baligh Uddin [Sat, 5 Jul 2014 22:10:35 +0000 (15:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I75c29be2b22f6cf19a373c4be07f7a8410a14cb1
Auto-generated-cl: translation import
Baligh Uddin [Sat, 5 Jul 2014 18:08:40 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e2eae5b30231f3dc719c231d51c35234ed9dd94
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:02:50 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 22:09:48 +0000 (15:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic88faf73641a8570560ffe751f0c5776290c75c3
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:00:38 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 22:25:24 +0000 (15:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1765b9912ea2356677a927edb34166ea5cab43d9
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:00:33 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 22:30:27 +0000 (15:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1fd2ea26acb4d0e1c46c887c94d25e0ea1407e81
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:28:46 +0000 (18:28 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 16:37:11 +0000 (09:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4b5accea11eca57ba5c42f35eef40aaf7010ccd
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:22:30 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 16:49:29 +0000 (09:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5577bfec3d18dd6a399f8ad5e0b520e992eac1e5
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:18:57 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 18:54:26 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4679d0c0cec6404efadee93753f5877d4d0d1db6
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:18:40 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 21:03:04 +0000 (14:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I373c01ed35b98a24791ab2fdfa57e019b8e705ba
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:15:54 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 21:08:04 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic36073cb71d82e8bb36b3409185a0bfc9ddb0ecd
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:08:17 +0000 (18:08 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 22:18:31 +0000 (15:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic92e03292351a4163522907fd285ad41d4877039
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:02:45 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 22:12:04 +0000 (15:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I986812a228a7207cb203a4c0862d96dbd0f1e868
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Jul 2014 15:04:35 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 2 Jul 2014 15:04:32 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 2 Jul 2014 15:04:24 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Robert Ly [Wed, 2 Jul 2014 00:00:58 +0000 (17:00 -0700)]
docs: updated expandedtext_combo
Change-Id: Ida3f08560710bf9d32fefd6797830f2258fed3c6
Baligh Uddin [Tue, 1 Jul 2014 18:22:35 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I006181afb024c03d268793fe4a8f547d9ee82d6b
Auto-generated-cl: translation import
Baligh Uddin [Tue, 1 Jul 2014 18:15:32 +0000 (11:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I71e375bba32fd94ba872c7f5f35f338470a53524
Auto-generated-cl: translation import
Baligh Uddin [Tue, 1 Jul 2014 18:14:28 +0000 (11:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I827912aaef1d4a9bd0d38cdcbc24143d91704b56
Auto-generated-cl: translation import
Robert Ly [Tue, 1 Jul 2014 23:57:04 +0000 (23:57 +0000)]
Merge "docs: add more notification images" into klp-modular-dev
Robert Ly [Tue, 1 Jul 2014 23:52:56 +0000 (16:52 -0700)]
docs: add more notification images
Change-Id: Ia71ef7783c89da319a9179a4f1c4ab197df818c5
Baligh Uddin [Tue, 1 Jul 2014 18:06:29 +0000 (18:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 1 Jul 2014 17:44:30 +0000 (10:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8995e4e7008c4ec3c06e6ef65046d8fc9987c33a
Auto-generated-cl: translation import
Baligh Uddin [Tue, 1 Jul 2014 18:06:27 +0000 (18:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 1 Jul 2014 17:47:53 +0000 (10:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1027a88bab0d00d223807bba87f9bbb75aef4d79
Auto-generated-cl: translation import
Baligh Uddin [Tue, 1 Jul 2014 17:45:41 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7ad5171c74ba22fff8602cf99b6a87f93f0f86a0
Auto-generated-cl: translation import
Robert Ly [Tue, 1 Jul 2014 02:46:53 +0000 (02:46 +0000)]
Merge "docs: add new UX images for notifications and wear" into klp-modular-dev
Robert Ly [Tue, 1 Jul 2014 01:18:22 +0000 (18:18 -0700)]
docs: add new UX images for notifications and wear
Change-Id: I936209db7260c77aec425f3457497cd70a66b767
Robert Ly [Mon, 30 Jun 2014 19:48:22 +0000 (12:48 -0700)]
docs: fix notifications docs
Change-Id: I14f55619ae0e0c53811c09410fec5ef8bf577ff6
Quddus Chong [Mon, 30 Jun 2014 21:46:59 +0000 (21:46 +0000)]
Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev
Quddus Chong [Thu, 12 Jun 2014 20:59:34 +0000 (13:59 -0700)]
docs: Add Javadocs for GMS Longhorn.
Change-Id: I2662b0af0609450364cbcc4666535fd57eec3ce7
Robert Ly [Fri, 27 Jun 2014 18:12:04 +0000 (11:12 -0700)]
docs: notif image
Change-Id: I2ee3e1da39297f74c8142875c3e71fb0953f5a46
Quddus Chong [Mon, 30 Jun 2014 21:46:50 +0000 (21:46 +0000)]
Merge "docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0)" into klp-modular-dev
Tim Kilbourn [Mon, 30 Jun 2014 20:49:43 +0000 (20:49 +0000)]
Merge "Fix docs" into klp-modular-dev
Tim Kilbourn [Mon, 30 Jun 2014 20:33:52 +0000 (13:33 -0700)]
Fix docs
Update a few references to the Leanback theme.
https://code.google.com/p/android/issues/detail?id=72757
Change-Id: I47387433cc02fd29b62b729bc34756cef1d539f3
Dirk Dougherty [Mon, 30 Jun 2014 01:04:44 +0000 (01:04 +0000)]
Merge "Change card title for admob." into klp-modular-dev
Dirk Dougherty [Fri, 27 Jun 2014 22:59:15 +0000 (15:59 -0700)]
Change card title for admob.
Change-Id: Ia4b4eaf7bbd54e9c546f740a5095431081d1ebd9
Dirk Dougherty [Mon, 30 Jun 2014 01:00:49 +0000 (01:00 +0000)]
Merge "Doc change: API diff 20." into klp-modular-dev
Robert Ly [Sun, 29 Jun 2014 23:53:54 +0000 (16:53 -0700)]
add api 20
DO NOT MERGE
Change-Id: Iae685158ac9c08e3a074e36d60004faf995fd1c7
Dirk Dougherty [Mon, 23 Jun 2014 19:11:35 +0000 (12:11 -0700)]
Doc change: API diff 20.
Change-Id: I1d3e00c1e62568c04abe6531819e75873df235c0
Robert Ly [Sun, 29 Jun 2014 23:50:00 +0000 (23:50 +0000)]
Merge "Revert "add API reference docs filtering for level 20"" into klp-modular-dev
Robert Ly [Sun, 29 Jun 2014 23:49:46 +0000 (23:49 +0000)]
Revert "add API reference docs filtering for level 20"
This reverts commit
7d7d4d6b86bdbfc54c63830351cf8d2f3830b68a.
Change-Id: I41e89bf297cb11db62601b3df0e6c655d7579007
Robert Ly [Sun, 29 Jun 2014 23:39:06 +0000 (16:39 -0700)]
add API reference docs filtering for level 20
Change-Id: Iaab9d0965511d0394e7be29adb0fbcfd2904b857
Scott Main [Sat, 28 Jun 2014 02:33:47 +0000 (02:33 +0000)]
Merge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev
smain@google.com [Sat, 28 Jun 2014 00:05:32 +0000 (17:05 -0700)]
revisions to the app structure design guide
Change-Id: I15e68e454180b848db81791350ba7985817c0930
Joe Fernandez [Sat, 28 Jun 2014 00:00:59 +0000 (17:00 -0700)]
docs: fix L Preview G+ links (permanently)
Change-Id: I699ae07a977495a23c3cb0f440f90c856bc17a3e
Robert Ly [Sun, 29 Jun 2014 23:41:08 +0000 (23:41 +0000)]
Merge "add API reference docs filtering for level 20" into klp-modular-dev
Robert Ly [Sun, 29 Jun 2014 23:40:33 +0000 (23:40 +0000)]
Merge "docs : fix broken links" into klp-modular-dev