git.osdn.net Git - android-x86/frameworks-base.git/log

Brian Carlstrom [Mon, 7 Jul 2014 21:08:48 +0000 (21:08 +0000)]

am 1f8eb4a6: (-s ours) am 044492e1: am 52a154fe: Merge "Remove"

* commit '1f8eb4a6b0c9e8aa349212318b416e2d05b8c23c':
Remove

commit | commitdiff | tree

Brian Carlstrom [Mon, 7 Jul 2014 21:00:07 +0000 (21:00 +0000)]

am 044492e1: am 52a154fe: Merge "Remove"

* commit '044492e1b710c1e604c02b08e0ec97cbb1d5d513':
Remove

commit | commitdiff | tree

Brian Carlstrom [Mon, 7 Jul 2014 20:55:16 +0000 (20:55 +0000)]

am 52a154fe: Merge "Remove"

* commit '52a154febb7c06b142116235c368417dd5e542ba':
Remove

commit | commitdiff | tree

Julia Reynolds [Mon, 7 Jul 2014 20:07:01 +0000 (16:07 -0400)]

Apply user restrictions to SettingsProvider.

Change-Id: If68c715bc688bf0df63591e0b8f8bf8a2b6dd118

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 3 Jul 2014 00:28:20 +0000 (17:28 -0700)]

Add PreferenceFragment styling

- add the capability to specify a specific layout for PreferenceFragment

Change-Id: I2fa36b8fa8110e6cbc8006e1d000dc90ae6a5f0b

commit | commitdiff | tree

Brian Carlstrom [Mon, 7 Jul 2014 20:48:48 +0000 (20:48 +0000)]

commit | commitdiff | tree

Brian Carlstrom [Tue, 17 Jun 2014 20:57:58 +0000 (13:57 -0700)]

Remove

(cherry picked from commit 9881203920c8445e9a4bdd9e4a90ba0014f34c5e)

Change-Id: Ib40823b7c03af4c71da902b0e5c504e074cf0dd9

commit | commitdiff | tree

Robert Ly [Mon, 7 Jul 2014 17:49:18 +0000 (17:49 +0000)]

am d1e3afb5: Merge "docs: update device dashboard for july" into klp-modular-dev

* commit 'd1e3afb5be9f983e4dfcbcbaf908261c6454992e':
docs: update device dashboard for july

commit | commitdiff | tree

Robert Ly [Mon, 7 Jul 2014 17:49:14 +0000 (17:49 +0000)]

am b50dd5a2: Merge "docs: fix links" into klp-modular-dev

* commit 'b50dd5a2f2018056bf3695685562a7e64bde17ad':
docs: fix links

commit | commitdiff | tree

Craig Mautner [Mon, 7 Jul 2014 17:26:20 +0000 (17:26 +0000)]

am a7f02a5c: am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."

* commit 'a7f02a5cda27147fe7076805187fb6fbc60fdcfb':
[ActivityManager] Avoid keeping restarting home when only home activity exists.

commit | commitdiff | tree

Craig Mautner [Mon, 7 Jul 2014 17:23:06 +0000 (17:23 +0000)]

am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."

* commit 'ef2e76675a6c60a2a4764a2e19fdb2c4d9beb00e':
[ActivityManager] Avoid keeping restarting home when only home activity exists.

commit | commitdiff | tree

Quddus Chong [Mon, 7 Jul 2014 16:10:13 +0000 (16:10 +0000)]

am af165529: Merge "docs: Fixed url pointing to Google Play Services 5.0 blog post." into klp-modular-dev

* commit 'af16552983d3d3015b85b73507d5a060d76a67cd':
docs: Fixed url pointing to Google Play Services 5.0 blog post.

commit | commitdiff | tree

Quddus Chong [Mon, 7 Jul 2014 16:10:09 +0000 (16:10 +0000)]

am f6438653: Merge "docs: Removed early adopter text from app indexing training doc." into klp-modular-dev

* commit 'f6438653e193e5273a76ec910dff929a40871b8e':
docs: Removed early adopter text from app indexing training doc.

commit | commitdiff | tree

Ricardo Cervera [Mon, 7 Jul 2014 16:10:04 +0000 (16:10 +0000)]

am 409b9ed7: Merge "docs: Added release notes and links for sdk/adt 23.0.2" into klp-modular-dev

* commit '409b9ed7b8bee4af2832ccd1c6b76eedf6081a03':
docs: Added release notes and links for sdk/adt 23.0.2

commit | commitdiff | tree

Craig Mautner [Mon, 7 Jul 2014 15:41:55 +0000 (15:41 +0000)]

am 09c1af5d: am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."

* commit '09c1af5d5c43f716fb4093eae6cf5442e7bb88d1':
[ActivityManager] Prevent kill a restarted process again.

commit | commitdiff | tree

Craig Mautner [Mon, 7 Jul 2014 15:36:33 +0000 (15:36 +0000)]

am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."

* commit 'c66da9d606fa3091540bc4c51c2904cc949bf777':
[ActivityManager] Prevent kill a restarted process again.

commit | commitdiff | tree

Craig Mautner [Mon, 7 Jul 2014 15:06:41 +0000 (15:06 +0000)]

am 7611a5d3: am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm."

* commit '7611a5d32889f54b1763cf076a442a0575c69b51':
[ActivityManager] Ensure alive process is not killedByAm.

commit | commitdiff | tree

Craig Mautner [Mon, 7 Jul 2014 15:00:47 +0000 (15:00 +0000)]

am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm."

* commit '5acdd0f67db9b5f41a89dfb5200f37d6f5f984ec':
[ActivityManager] Ensure alive process is not killedByAm.

commit | commitdiff | tree

Narayan Kamath [Mon, 7 Jul 2014 10:11:23 +0000 (10:11 +0000)]

am e0849423: am 501bb0a5: Merge "Fix issue when converting fil->tl."

* commit 'e0849423214007d4377638fb42db15276e3ca575':
Fix issue when converting fil->tl.

commit | commitdiff | tree

Narayan Kamath [Mon, 7 Jul 2014 08:57:04 +0000 (08:57 +0000)]

am 501bb0a5: Merge "Fix issue when converting fil->tl."

* commit '501bb0a5e4a62a9e58efe2fa0a3f275c193872e7':
Fix issue when converting fil->tl.

commit | commitdiff | tree

Robert Ly [Sun, 6 Jul 2014 22:31:00 +0000 (22:31 +0000)]

am 8f0f930d: Merge "Fix incorrect link in Android Wear documentation." into klp-modular-dev

* commit '8f0f930d3bf8d74c4680cc94a8def9e3db0989b8':
Fix incorrect link in Android Wear documentation.

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 19:49:37 +0000 (19:49 +0000)]

am abef99cf: (-s ours) am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'abef99cf6a18873ff2079285d26755b41aed979b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 19:49:33 +0000 (19:49 +0000)]

am 11281de7: (-s ours) am 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '11281de7a2c335ed5410fa83b275173130714f52':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 19:45:38 +0000 (19:45 +0000)]

am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '02c355d10b3235b73d58ab54222721e32bec3f1f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 19:45:34 +0000 (19:45 +0000)]

am 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '89523569e4c1be2e102b5fb991023d6696384d76':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 19:42:25 +0000 (19:42 +0000)]

am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '59db17673d9d2a5be386e9f324f8f2a7b455d0b1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 19:42:22 +0000 (19:42 +0000)]

am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '314bfe071011cc16d56a9c8bfb65000cd3597bf0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:44:06 +0000 (18:44 +0000)]

am de9bfb79: (-s ours) am 8e1bf9f1: (-s ours) am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'de9bfb799e99440888ecd911d60f42ff206c886c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:44:02 +0000 (18:44 +0000)]

am 9c9223d9: (-s ours) am 2ea222e6: (-s ours) am 93360f02: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '9c9223d91eb57ba7f45532e551861696c55883ec':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:40:04 +0000 (18:40 +0000)]

am 494d4005: (-s ours) am ab157d74: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '494d4005d5bb1e23fceefa766dca95c3acfa610f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:40:00 +0000 (18:40 +0000)]

am 861beac4: (-s ours) am 87bcd150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '861beac4f3c04850a8f99fca0bafb002a5ddecdf':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:39:57 +0000 (18:39 +0000)]

am 476a40e3: (-s ours) am f643d529: (-s ours) am b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '476a40e33243c7c86859aa7fbadb8f24c0c32d3b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:39:53 +0000 (18:39 +0000)]

am 2353a8fc: (-s ours) am 2f689434: (-s ours) am f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2353a8fc5da7402e7bdd0b6eb54edb583fe27f8f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:39:49 +0000 (18:39 +0000)]

am 5195064e: (-s ours) am 6e90b3c0: (-s ours) am f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5195064e8280c85fbda996df58e247e8a8509d1f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:39:28 +0000 (18:39 +0000)]

am 8e1bf9f1: (-s ours) am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8e1bf9f1a38b70459ddcaeb816b83c3c83e8c9b8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:33:33 +0000 (18:33 +0000)]

am 03c248aa: (-s ours) am 51ad6520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '03c248aadece8459d2568dd8721d46cf748c7a56':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:33:29 +0000 (18:33 +0000)]

am b140440e: (-s ours) am 6b7d2cf7: (-s ours) am f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'b140440ea33ce512ba372deb11171ac688b1200b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:33:26 +0000 (18:33 +0000)]

am 75a54319: (-s ours) am 6df13287: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '75a543193546525908c94981721a5d19f31fe285':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:33:22 +0000 (18:33 +0000)]

am 3b7b9f95: (-s ours) am 334c84cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '3b7b9f95a920e9b97067bc8004bd96156bcd8f7e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:33:07 +0000 (18:33 +0000)]

am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '43ba3ba479e3779db4f260eae55ddbfbf3dc30d8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:29:18 +0000 (18:29 +0000)]

am b14aee38: (-s ours) am add3fb66: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit 'b14aee38b65d1896f51a31c428c1eb387709597a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:29:13 +0000 (18:29 +0000)]

am bd9866d3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'bd9866d3e8ea9deb5b0bd5614a940cde841222ab':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:21:24 +0000 (18:21 +0000)]

am c1f450dc: (-s ours) am fd5e4617: (-s ours) am f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'c1f450dc64d43c0893858538c96fd0a1e7992565':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:21:20 +0000 (18:21 +0000)]

am 16b3c375: am 026d5d21: Merge branch \'klp-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev

* commit '16b3c3750f9a6ea13f313eb5e76ae3adbfb6fc83':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:21:16 +0000 (18:21 +0000)]

am ac572525: (-s ours) am e885a9ca: (-s ours) am eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'ac572525dfe2664bc2bd4fea510c3ca5e600648a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:21:13 +0000 (18:21 +0000)]

am 200e21c5: (-s ours) am 57a85cee: (-s ours) am 77c61120: (-s ours) Import translations. DO NOT MERGE

* commit '200e21c58996d76eb16e85963ca6c44770f9db05':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:15:28 +0000 (18:15 +0000)]

am ca78b88e: (-s ours) am b84a800c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit 'ca78b88eaa4d8b14d2dc1347f65715d2008e2974':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:15:24 +0000 (18:15 +0000)]

am f6020778: (-s ours) am 562d8cc7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit 'f6020778cd651dbec3ae907dde7880b4c0ef66c4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:15:20 +0000 (18:15 +0000)]

am 037bcb40: (-s ours) am f617f4d0: (-s ours) Import translations. DO NOT MERGE

* commit '037bcb4022432b6bee530964ae6b96c8e81c7768':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 6 Jul 2014 18:07:09 +0000 (18:07 +0000)]

am 30a777ef: (-s ours) Import translations. DO NOT MERGE

* commit '30a777ef5bea16605aea06dd7b545938d019b28f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Craig Mautner [Mon, 7 Jul 2014 15:29:50 +0000 (15:29 +0000)]

Merge "[ActivityManager] Prevent kill a restarted process again."

commit | commitdiff | tree

Robert Ly [Sun, 6 Jul 2014 22:25:29 +0000 (22:25 +0000)]

Merge "Fix incorrect link in Android Wear documentation." into klp-modular-dev

commit | commitdiff | tree

Flavio Lerda [Sun, 6 Jul 2014 21:56:39 +0000 (22:56 +0100)]

Fix incorrect link in Android Wear documentation.

The link name was misspelled and pointed to the wrong directory.

Change-Id: I471892349dbe3ebbe9ec425a2a78b172d2ec6a0f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 17:22:51 +0000 (17:22 +0000)]

am 7228aa10: am 42b74e23: Merge "Typo in method name: Clone"

* commit '7228aa109aaef18b8447b369ae2a90cecf2c9601':
Typo in method name: Clone

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 17:17:47 +0000 (17:17 +0000)]

am dbed61c8: am ca2df286: Merge "Fix typo in the exception message."

* commit 'dbed61c860367cead2767c66699eaf8c7bba59cf':
Fix typo in the exception message.

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 17:17:40 +0000 (17:17 +0000)]

am d05a0743: am a347ece5: Merge "Fix typo in comment of FragmentTransaction"

* commit 'd05a0743484da59d341792749a3cf35f18a7e11c':
Fix typo in comment of FragmentTransaction

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 17:16:59 +0000 (17:16 +0000)]

am 42b74e23: Merge "Typo in method name: Clone"

* commit '42b74e231d893f553e4e8c88641e056ebcf82ac5':
Typo in method name: Clone

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 17:11:47 +0000 (17:11 +0000)]

am ca2df286: Merge "Fix typo in the exception message."

* commit 'ca2df28678352ea72cfb8a680796d0a908b2453b':
Fix typo in the exception message.

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 17:11:42 +0000 (17:11 +0000)]

am a347ece5: Merge "Fix typo in comment of FragmentTransaction"

* commit 'a347ece5a77d4b695af6255d751d98dbb519ad74':
Fix typo in comment of FragmentTransaction

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 17:06:18 +0000 (17:06 +0000)]

am e1d8ee41: am ce259483: Merge "Added missing brace."

* commit 'e1d8ee41c0567417c1d0486c0778673cfa9b75ee':
Added missing brace.

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 17:06:11 +0000 (17:06 +0000)]

am 664ec0a6: am 77491ac0: Merge "Correct typo in doc comment"

* commit '664ec0a6e6cedf47adc54f2e0cd8f1435d699b72':
Correct typo in doc comment

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 17:06:04 +0000 (17:06 +0000)]

am f397f6f1: am a2e4ce2b: Merge "Fix typo - issue 56671"

* commit 'f397f6f10dc1d99182bc3903d4e3751d348a3320':
Fix typo - issue 56671

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 17:05:58 +0000 (17:05 +0000)]

am c43f3eb6: am 8b333467: Merge "fix trivial typo: s/meansure/measure"

* commit 'c43f3eb67bbf60af61b3cd18bc5b6a684c8744c6':
fix trivial typo: s/meansure/measure

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 17:03:50 +0000 (17:03 +0000)]

am ce259483: Merge "Added missing brace."

* commit 'ce2594832593dbf0d9d03f83054cabc9429261fa':
Added missing brace.

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 17:03:45 +0000 (17:03 +0000)]

am 77491ac0: Merge "Correct typo in doc comment"

* commit '77491ac00c18cd81328a3942c78a64436be65618':
Correct typo in doc comment

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 16:59:56 +0000 (16:59 +0000)]

am a2e4ce2b: Merge "Fix typo - issue 56671"

* commit 'a2e4ce2b7cab301f8bde5e4747be5dd85e899a63':
Fix typo - issue 56671

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 16:59:51 +0000 (16:59 +0000)]

am 8b333467: Merge "fix trivial typo: s/meansure/measure"

* commit '8b333467fea995d9cec72dddfcba8fa19363ee32':
fix trivial typo: s/meansure/measure

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 16:56:47 +0000 (16:56 +0000)]

am d92ab153: am a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator"

* commit 'd92ab153a3a33dcd1304661a9929112ab0b40d5a':
Fix a copy/paste typo in ViewPropertyAnimator

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 16:52:11 +0000 (16:52 +0000)]

am a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator"

* commit 'a6336747a42fa5b64f82b7fe57ddf614d1fda9b2':
Fix a copy/paste typo in ViewPropertyAnimator

commit | commitdiff | tree

Nick Kralevich [Sat, 5 Jul 2014 16:51:45 +0000 (16:51 +0000)]

am 3b4c2c98: am 63af727b: Merge "Fix Issue 59989"

* commit '3b4c2c982ef4ac681929678288ce042e4c0a5be6':
Fix Issue 59989