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

Ricardo Cervera [Fri, 11 Jul 2014 16:19:29 +0000 (16:19 +0000)]

am 908d35e7: am f4d498f1: Merge "docs: Release notes for support lib v20" into klp-modular-dev

* commit '908d35e79eb457f9fe5cecc33951ca68d2f80e30':
docs: Release notes for support lib v20

commit | commitdiff | tree

Quddus Chong [Fri, 11 Jul 2014 16:19:21 +0000 (16:19 +0000)]

am 1656fb8c: am 9a3dd19d: docs: Fixed angle bracket typo for task locking command line instructions. bug: 16153312

* commit '1656fb8cc74d56870c772c048fd479268fdfbb48':
docs: Fixed angle bracket typo for task locking command line instructions. bug: 16153312

commit | commitdiff | tree

Robert Greenwalt [Fri, 11 Jul 2014 16:19:16 +0000 (16:19 +0000)]

am ca19b7cb: am a7efe9b8: am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun"

* commit 'ca19b7cbdfadb50f578fd688bec18a3fc34d98cd':
Add Telefonica/Movistar specific APN details for dun

commit | commitdiff | tree

Ricardo Cervera [Tue, 8 Jul 2014 17:36:31 +0000 (17:36 +0000)]

am f4d498f1: Merge "docs: Release notes for support lib v20" into klp-modular-dev

* commit 'f4d498f17f5abc9297dc5c3eff0858f773828044':
docs: Release notes for support lib v20

commit | commitdiff | tree

Ricardo Cervera [Tue, 8 Jul 2014 17:34:14 +0000 (17:34 +0000)]

Merge "docs: Release notes for support lib v20" into klp-modular-dev

commit | commitdiff | tree

Ricardo Cervera [Mon, 7 Jul 2014 20:15:56 +0000 (13:15 -0700)]

docs: Release notes for support lib v20

Change-Id: I82bbad9ad8945e9437b790e0f47622ef00b318f1

commit | commitdiff | tree

Quddus Chong [Tue, 8 Jul 2014 17:16:45 +0000 (17:16 +0000)]

am 9a3dd19d: docs: Fixed angle bracket typo for task locking command line instructions. bug: 16153312

* commit '9a3dd19df890972a66c2b74ac6e47fc49de5bc2f':
docs: Fixed angle bracket typo for task locking command line instructions. bug: 16153312

commit | commitdiff | tree

Quddus Chong [Tue, 8 Jul 2014 17:07:43 +0000 (10:07 -0700)]

docs: Fixed angle bracket typo for task locking command line instructions.
bug: 16153312

Change-Id: If552028d36878398fe6fd999e711dff321fa9f13

commit | commitdiff | tree

Robert Greenwalt [Tue, 8 Jul 2014 17:03:36 +0000 (17:03 +0000)]

am a7efe9b8: am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun"

* commit 'a7efe9b8743e4a7d8a5b9ef247f6d780f33b4021':
Add Telefonica/Movistar specific APN details for dun

commit | commitdiff | tree

Robert Greenwalt [Tue, 8 Jul 2014 16:59:17 +0000 (16:59 +0000)]

am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun"

* commit '912700fca8e02fe93fca7d95ef22472f77349ffe':
Add Telefonica/Movistar specific APN details for dun

commit | commitdiff | tree

kmccormick [Mon, 7 Jul 2014 23:23:35 +0000 (23:23 +0000)]

am 74223986: Doc Update: Add Cloud Save to left nav.

* commit '74223986adef1ccee9c29b68c6eaca3e9a5ff1de':
Doc Update: Add Cloud Save to left nav.

commit | commitdiff | tree

kmccormick [Mon, 7 Jul 2014 21:18:30 +0000 (14:18 -0700)]

Doc Update: Add Cloud Save to left nav.

Change-Id: Id87b0ea16231bc70cbd8147ec5252aad251f2363

commit | commitdiff | tree

Craig Mautner [Mon, 7 Jul 2014 21:24:41 +0000 (21:24 +0000)]

am 6d6d2189: am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."

* commit '6d6d2189625a679948920861b957948b505cb53f':
[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.

commit | commitdiff | tree

Craig Mautner [Mon, 7 Jul 2014 21:19:45 +0000 (21:19 +0000)]

am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."

* commit '08881385a86bf887669a555ae03759c374ec9c50':
[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.

commit | commitdiff | tree

Ricardo Cervera [Mon, 7 Jul 2014 21:16:06 +0000 (21:16 +0000)]

am fc55076b: Merge "docs: Minor fix in the Building Your Project with Gradle guide" into klp-modular-dev

* commit 'fc55076b5899e67b0666e490bc56034b49a7a042':
docs: Minor fix in the Building Your Project with Gradle guide

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

Robert Greenwalt [Tue, 8 Jul 2014 16:53:49 +0000 (16:53 +0000)]

Merge "Add Telefonica/Movistar specific APN details for dun"

commit | commitdiff | tree

Albert [Tue, 8 Jul 2014 04:56:08 +0000 (06:56 +0200)]

Add Telefonica/Movistar specific APN details for dun

Movistar Spain needs to add a specific APN to offer tethering
in their devices.

Change-Id: I5554ff98a5ac4c5f33b9af0083e1fac8305c9e13
Signed-off-by: Albert <alberto.crespell@gmail.com>

commit | commitdiff | tree

Alan Viverette [Tue, 8 Jul 2014 00:54:40 +0000 (00:54 +0000)]

Merge "Make the positive dialog button use accent color"

commit | commitdiff | tree

Alan Viverette [Tue, 8 Jul 2014 00:53:57 +0000 (17:53 -0700)]

Make the positive dialog button use accent color

BUG: 16134401
Change-Id: Icada7415328cea16288824f75049a2952303841f

commit | commitdiff | tree

Alan Viverette [Tue, 8 Jul 2014 00:13:24 +0000 (00:13 +0000)]

Merge "Fix layer drawable inflation"

commit | commitdiff | tree

Alan Viverette [Tue, 8 Jul 2014 00:12:42 +0000 (17:12 -0700)]

Fix layer drawable inflation

Change-Id: I2f16e3ddea919c33dc7b62f457a994e6d8a66e5b

commit | commitdiff | tree

Craig Stout [Mon, 23 Jun 2014 21:13:43 +0000 (14:13 -0700)]

NumberPicker fixes for Android TV.

Fixed stuck dpad navigation when end of range is reached.
Adds theme attribute 'hideWheelUntilFocused'.

b/15194230

Change-Id: I9a77c6ad29a1fd930a8920d9944ad1eb15ca6b96

commit | commitdiff | tree

Alan Viverette [Mon, 7 Jul 2014 23:28:06 +0000 (16:28 -0700)]

Fix build

Change-Id: I20f3ae19bd6d7cdc6dd6b9e947bdfea38893a167

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

Ricardo Cervera [Mon, 7 Jul 2014 21:05:53 +0000 (21:05 +0000)]

Merge "docs: Minor fix in the Building Your Project with Gradle guide" into klp-modular-dev

commit | commitdiff | tree

Winson Chung [Tue, 8 Jul 2014 00:36:30 +0000 (00:36 +0000)]

Merge "Refactoring to support groups."

commit | commitdiff | tree

Winson Chung [Thu, 3 Jul 2014 22:54:42 +0000 (15:54 -0700)]

Refactoring to support groups.

- Removing RecentService, determining animations just in time
- Fixing a few issues with animations of newly picked up tasks from the pool
- Moving helper classes into sub package

Change-Id: Ie10385d1f9ca79eea918b16932f56b60e2802304

commit | commitdiff | tree

Craig Mautner [Mon, 7 Jul 2014 21:30:57 +0000 (21:30 +0000)]

am 3bc1bafa: am 6d6d2189: am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."

* commit '3bc1bafabaedffede8963703cf3bfde2054ef91a':
[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.

commit | commitdiff | tree

Ricardo Cervera [Mon, 7 Jul 2014 21:19:30 +0000 (21:19 +0000)]

am b9c27e40: am fc55076b: Merge "docs: Minor fix in the Building Your Project with Gradle guide" into klp-modular-dev

* commit 'b9c27e40addb72551dd1938a5a54aa1c56e2a6c5':
docs: Minor fix in the Building Your Project with Gradle guide

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

Ricardo Cervera [Mon, 7 Jul 2014 17:24:47 +0000 (10:24 -0700)]

docs: Minor fix in the Building Your Project with Gradle guide

Change-Id: Ibcb27f4f7cade4a69babd08d7273440a4554e79f

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