Andreas Gampe
|
08067d9829
|
am 8e176d39: am 007e207b: Merge "Frameworks/base: Fix null-pointer check"
* commit '8e176d396d393af90ffe288d849e95ff40aa2b23':
Frameworks/base: Fix null-pointer check
|
2015-03-16 17:20:12 +00:00 |
|
Andreas Gampe
|
ebb8922a5b
|
am 19279ec0: am d61cbf9a: Merge "Frameworks/base: Fix a constructor"
* commit '19279ec04845b2a47b90240c9d47bf8fb5ece464':
Frameworks/base: Fix a constructor
|
2015-03-16 17:13:26 +00:00 |
|
Andreas Gampe
|
8e176d396d
|
am 007e207b: Merge "Frameworks/base: Fix null-pointer check"
* commit '007e207bdeda3f0143eba8f52db3e72bf7487efb':
Frameworks/base: Fix null-pointer check
|
2015-03-16 17:12:57 +00:00 |
|
Andreas Gampe
|
19279ec048
|
am d61cbf9a: Merge "Frameworks/base: Fix a constructor"
* commit 'd61cbf9a08733b45a6aecafffffa60da269a3e1e':
Frameworks/base: Fix a constructor
|
2015-03-16 17:03:02 +00:00 |
|
Andreas Gampe
|
007e207bde
|
Merge "Frameworks/base: Fix null-pointer check"
|
2015-03-16 16:59:14 +00:00 |
|
Andreas Gampe
|
d61cbf9a08
|
Merge "Frameworks/base: Fix a constructor"
|
2015-03-16 16:51:01 +00:00 |
|
Robert Greenwalt
|
88dadfaa3b
|
am 7cff91ea: am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"
* commit '7cff91ea67f89ca963a822daa1b68674bfc0e587':
Frameworks/base: Fix a hashCode implementation
|
2015-03-16 16:48:46 +00:00 |
|
Andreas Gampe
|
1109006158
|
resolved conflicts for merge of 038b8462 to master
Change-Id: I394b152c3cfe8368e87fc4bc57566b410c96b554
|
2015-03-16 09:45:34 -07:00 |
|
Ronghua Wu
|
0e22acb635
|
Merge "media: add MediaFormat.KEY_PRIORITY."
|
2015-03-16 16:38:25 +00:00 |
|
Robert Greenwalt
|
7cff91ea67
|
am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"
* commit '079cfa64ec827e80d3173e2043218866f1b36146':
Frameworks/base: Fix a hashCode implementation
|
2015-03-16 16:29:52 +00:00 |
|
Robert Greenwalt
|
079cfa64ec
|
Merge "Frameworks/base: Fix a hashCode implementation"
|
2015-03-16 16:17:51 +00:00 |
|
Filip Gruszczynski
|
9779e128d6
|
Option for going home when going to sleep for devices without physical button.
Bug: 19623388
Change-Id: Iec16f83c64646ded12ec97d4b540510b7f9dfd47
|
2015-03-16 08:57:17 -07:00 |
|
Andreas Gampe
|
038b846284
|
am 5abcd06b: Merge "Frameworks/base: Fix always-false equals"
* commit '5abcd06b1f673a2d59d1aba5f4b95fe741ace274':
Frameworks/base: Fix always-false equals
|
2015-03-16 15:43:37 +00:00 |
|
Mike Reed
|
def6ef85c5
|
Merge "use SkFilterQuality instead of SkPaint::FilterLevel"
|
2015-03-16 15:36:43 +00:00 |
|
Mike Reed
|
2a1ce8a4e5
|
use SkFilterQuality instead of SkPaint::FilterLevel
Change-Id: I5d26869de746107b8a35a7a662236f993a824b0d
|
2015-03-16 11:31:38 -04:00 |
|
Geoff Mendal
|
2c782e7cf8
|
Merge "Import translations. DO NOT MERGE"
|
2015-03-16 15:29:52 +00:00 |
|
Andreas Gampe
|
5abcd06b1f
|
Merge "Frameworks/base: Fix always-false equals"
|
2015-03-16 15:28:53 +00:00 |
|
John Reck
|
2c528c2175
|
am 059ba981: am 386dcbdd: Merge "Frameworks/base: Fix missing cast"
* commit '059ba9814bb07aeebd8bf697fc05ff833c63033b':
Frameworks/base: Fix missing cast
|
2015-03-16 15:16:17 +00:00 |
|
John Reck
|
059ba9814b
|
am 386dcbdd: Merge "Frameworks/base: Fix missing cast"
* commit '386dcbddf5c166f98209b78389e79d49ab3a8222':
Frameworks/base: Fix missing cast
|
2015-03-16 15:09:04 +00:00 |
|
John Reck
|
386dcbddf5
|
Merge "Frameworks/base: Fix missing cast"
|
2015-03-16 14:56:52 +00:00 |
|
Geoff Mendal
|
d64e48d850
|
Import translations. DO NOT MERGE
Change-Id: Ib0dfcbb5ffa71a512164af5435a0784279bde292
Auto-generated-cl: translation import
|
2015-03-16 07:43:37 -07:00 |
|
Robin Lee
|
ee1f24ff29
|
Merge "Recognise insecure encryption with a new constant"
|
2015-03-16 14:32:12 +00:00 |
|
Geoff Mendal
|
592f880895
|
Merge "Import translations. DO NOT MERGE"
|
2015-03-16 14:02:00 +00:00 |
|
Geoff Mendal
|
70c1675036
|
Merge "Import translations. DO NOT MERGE"
|
2015-03-16 13:48:55 +00:00 |
|
Geoff Mendal
|
47c6843cb5
|
Import translations. DO NOT MERGE
Change-Id: I5974745b1b216beda4ebed9da78b0b2c0b4d4efe
Auto-generated-cl: translation import
|
2015-03-16 06:37:26 -07:00 |
|
Geoff Mendal
|
717bbf53f8
|
Import translations. DO NOT MERGE
Change-Id: Id941e0ba453bd6b39cf654f0a20a68219584bd2a
Auto-generated-cl: translation import
|
2015-03-16 06:25:49 -07:00 |
|
Geoff Mendal
|
a41378ac27
|
am c64f5ca0: (-s ours) am 0134869b: (-s ours) am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'c64f5ca02b16ebece40c21f401f75c7ace8178ac':
Import translations. DO NOT MERGE
|
2015-03-16 13:22:28 +00:00 |
|
Geoff Mendal
|
19f65359b9
|
am 4777b612: (-s ours) am 3437d9e7: (-s ours) am 57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '4777b612e07f57afbcf362b78b0b6e1e5e77e8bb':
Import translations. DO NOT MERGE
|
2015-03-16 13:22:20 +00:00 |
|
Geoff Mendal
|
ef096473c8
|
Merge "Import translations. DO NOT MERGE"
|
2015-03-16 13:20:50 +00:00 |
|
Geoff Mendal
|
8e39914610
|
Import translations. DO NOT MERGE
Change-Id: I47e03bc7c00c7cb751c063324027e7846b067eaf
Auto-generated-cl: translation import
|
2015-03-16 06:19:39 -07:00 |
|
Geoff Mendal
|
c64f5ca02b
|
am 0134869b: (-s ours) am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '0134869b5c81771ae3e3251fa42ac6c478e62f5a':
Import translations. DO NOT MERGE
|
2015-03-16 13:14:52 +00:00 |
|
Geoff Mendal
|
4777b612e0
|
am 3437d9e7: (-s ours) am 57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '3437d9e716e477d407dfc13cc797500e6421e464':
Import translations. DO NOT MERGE
|
2015-03-16 13:14:47 +00:00 |
|
Geoff Mendal
|
844c6a5194
|
Merge "Import translations. DO NOT MERGE"
|
2015-03-16 13:10:09 +00:00 |
|
Geoff Mendal
|
c890637d82
|
Merge "Import translations. DO NOT MERGE"
|
2015-03-16 13:08:43 +00:00 |
|
Geoff Mendal
|
0134869b5c
|
am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '74c66d10a7b2237f8aaf8c10675a10b9347860f4':
Import translations. DO NOT MERGE
|
2015-03-16 13:07:29 +00:00 |
|
Geoff Mendal
|
3437d9e716
|
am 57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '57d39a3d70cf820e830c351d9d7fbb5d16d42ecf':
Import translations. DO NOT MERGE
|
2015-03-16 13:07:26 +00:00 |
|
Geoff Mendal
|
74c66d10a7
|
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
|
2015-03-16 13:05:43 +00:00 |
|
Geoff Mendal
|
c84863bc2e
|
am 3fb3408b: (-s ours) am eb1aec7f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '3fb3408b2ecdd601e93a2675ef0f81b15334ed0a':
Import translations. DO NOT MERGE
|
2015-03-16 13:04:07 +00:00 |
|
Geoff Mendal
|
cb5ebc25fe
|
am e0c0f6c2: (-s ours) am 9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'e0c0f6c2a8eae1004227f4d0a3d5f77730b29ff7':
Import translations. DO NOT MERGE
|
2015-03-16 13:03:56 +00:00 |
|
Geoff Mendal
|
0ef51ec3dd
|
Import translations. DO NOT MERGE
Change-Id: Ic3f3b8418d69d37a26c0be77047faf3ea9294b0f
Auto-generated-cl: translation import
|
2015-03-16 06:03:55 -07:00 |
|
Geoff Mendal
|
0c5d398e9f
|
Import translations. DO NOT MERGE
Change-Id: I5059160456eb65bedb552f97b6ed500ef540839f
Auto-generated-cl: translation import
|
2015-03-16 05:57:47 -07:00 |
|
Geoff Mendal
|
3fb3408b2e
|
am eb1aec7f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'eb1aec7fef3597fbbffe157a803e1dd54a9054b5':
Import translations. DO NOT MERGE
|
2015-03-16 12:57:17 +00:00 |
|
Geoff Mendal
|
e0c0f6c2a8
|
am 9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '9a036229277479c0bc53d850ed5c98b8b69aa080':
Import translations. DO NOT MERGE
|
2015-03-16 12:57:12 +00:00 |
|
Geoff Mendal
|
1dc1220679
|
am 51448a1a: (-s ours) am e35b3e38: (-s ours) Import translations. DO NOT MERGE
* commit '51448a1a604ca7e4c8cedeb31d2907bcca524f6e':
Import translations. DO NOT MERGE
|
2015-03-16 12:56:32 +00:00 |
|
Geoff Mendal
|
de4be3bc2c
|
Import translations. DO NOT MERGE
Change-Id: I17a68a6a20954432a352e132ac02cb0c9597e1d3
Auto-generated-cl: translation import
|
2015-03-16 05:52:00 -07:00 |
|
Geoff Mendal
|
eb1aec7fef
|
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
|
2015-03-16 12:50:20 +00:00 |
|
Geoff Mendal
|
9a03622927
|
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
|
2015-03-16 12:49:40 +00:00 |
|
Geoff Mendal
|
51448a1a60
|
am e35b3e38: (-s ours) Import translations. DO NOT MERGE
* commit 'e35b3e380f42f450ce0116b8ef83edb7d68584ef':
Import translations. DO NOT MERGE
|
2015-03-16 12:49:25 +00:00 |
|
Geoff Mendal
|
57d39a3d70
|
Import translations. DO NOT MERGE
Change-Id: Icc111cdfe84d93d8212be18ba9815a50a83f059c
Auto-generated-cl: translation import
|
2015-03-16 05:48:31 -07:00 |
|
Geoff Mendal
|
f3e18606f7
|
Import translations. DO NOT MERGE
Change-Id: I6ecfa92145f12da6a6101a84c9fd10db911948a1
Auto-generated-cl: translation import
|
2015-03-16 05:35:33 -07:00 |
|