Alan Viverette
|
5ec0f1c9de
|
Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev
automerge: c0bf068
* commit 'c0bf068bbff3080b930c9bb50bd6cc935b135536':
Clean up encapsulation in date picker classes
|
2014-11-10 19:04:39 +00:00 |
|
Deepanshu Gupta
|
97c04ac7ed
|
Merge "Add primitive shadows support to LayoutLib" into lmp-dev
|
2014-11-10 18:58:30 +00:00 |
|
Elliott Hughes
|
c34e63598e
|
Merge "bionic's struct stat is now POSIX-compliant."
|
2014-11-10 18:55:30 +00:00 |
|
Deepanshu Gupta
|
f305d2c4a8
|
Merge "Remove needlessly thrown IOException." into lmp-dev
|
2014-11-10 18:54:21 +00:00 |
|
Elliott Hughes
|
4da9dc5a62
|
bionic's struct stat is now POSIX-compliant.
One less hack needed...
Bug: 18298106
Change-Id: I1e9e5ebf329bd6cbaf3445201f182793ee4871ce
|
2014-11-10 10:48:25 -08:00 |
|
Adrian Roos
|
a0ecc714c3
|
Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev
|
2014-11-10 18:35:59 +00:00 |
|
Jorim Jaggi
|
f4a15d438a
|
Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev
|
2014-11-10 18:31:55 +00:00 |
|
Jorim Jaggi
|
0a81822272
|
Fix Keyguard affordances for RTL
Bug: 17328362
Change-Id: Ic7d7a5a0d721390064493cf753348b89b7bac7e1
|
2014-11-10 19:31:22 +01:00 |
|
Alan Viverette
|
c0bf068bbf
|
Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev
|
2014-11-10 18:29:29 +00:00 |
|
Adrian Roos
|
450ce9fc8a
|
Disable LockPatternUtilsCache
Also fix a bug where hasPattern and hasPassword were
not invalidated properly.
Bug: 18163444
Change-Id: I5bd8cc4e7c0d00497ee7a42f3c34449aa3f95a6c
|
2014-11-10 19:16:41 +01:00 |
|
Dan Sandler
|
eba923ccce
|
am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev
* commit '04a1557c497d2ef0ab4011136b0945b20f291bb1':
Fix inset hinting when adding window
|
2014-11-10 18:13:35 +00:00 |
|
Dan Sandler
|
04a1557c49
|
Merge "Fix inset hinting when adding window" into lmp-mr1-dev
|
2014-11-10 18:10:36 +00:00 |
|
Rich Slogar
|
2d8cd7cbb2
|
docs:builds tools 21.1.1 update
Change-Id: I96fd6ad0926414664b192ca41d13f49f25365e4a
|
2014-11-10 09:59:15 -08:00 |
|
Andres Morales
|
b2201e44d7
|
am 089792ae: am 3a868411: am 2885c6ba: Merge "Fix build" into lmp-mr1-dev
* commit '089792aef91ff3978b487337d3e9f8a2df14e790':
Fix build
|
2014-11-10 17:45:55 +00:00 |
|
Geoff Mendal
|
af0d3eb64e
|
am ccfbd1ba: (-s ours) am 20083734: (-s ours) am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'ccfbd1bacc3c0ab5525b2cfd695ad225468a338e':
Import translations. DO NOT MERGE
|
2014-11-10 17:41:47 +00:00 |
|
Paul Jensen
|
357175a3ba
|
am f8059887: am 78a853d1: am cb32559a: Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev
* commit 'f805988770761e2446436d4e5fac58b3e95faac5':
Fix NetworkMonitor logging to include NetID.
|
2014-11-10 17:41:43 +00:00 |
|
Andres Morales
|
089792aef9
|
am 3a868411: am 2885c6ba: Merge "Fix build" into lmp-mr1-dev
* commit '3a8684117db531f3d56743ffa5a9c8ab7ccd0afd':
Fix build
|
2014-11-10 17:41:40 +00:00 |
|
Alan Viverette
|
fe3f4c811b
|
am 8eb4bf60: am 7213a52c: am 82aaf332: Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev
* commit '8eb4bf6017a34309c90427b1da6cb5f21538946a':
Update above/below backgrounds in PopupWindow.setBackground()
|
2014-11-10 17:37:10 +00:00 |
|
Geoff Mendal
|
ccfbd1bacc
|
am 20083734: (-s ours) am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '20083734d92eb893c36278d2486404eedc0cc1f9':
Import translations. DO NOT MERGE
|
2014-11-10 17:37:02 +00:00 |
|
Paul Jensen
|
f805988770
|
am 78a853d1: am cb32559a: Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev
* commit '78a853d17a33958ebc7d014cc6ec3998696302d3':
Fix NetworkMonitor logging to include NetID.
|
2014-11-10 17:36:56 +00:00 |
|
Andres Morales
|
3a8684117d
|
am 2885c6ba: Merge "Fix build" into lmp-mr1-dev
* commit '2885c6ba63850d5fd061460683de768617ed6b31':
Fix build
|
2014-11-10 17:35:55 +00:00 |
|
Alan Viverette
|
8eb4bf6017
|
am 7213a52c: am 82aaf332: Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev
* commit '7213a52c42e5dd176b30f01c274f36c63e32718e':
Update above/below backgrounds in PopupWindow.setBackground()
|
2014-11-10 17:32:38 +00:00 |
|
Andres Morales
|
2885c6ba63
|
Merge "Fix build" into lmp-mr1-dev
|
2014-11-10 17:31:27 +00:00 |
|
Geoff Mendal
|
20083734d9
|
am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '8f02ec4fce4a77c78eff04b709831e0f4ec7cb43':
Import translations. DO NOT MERGE
|
2014-11-10 17:31:24 +00:00 |
|
Paul Jensen
|
78a853d17a
|
am cb32559a: Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev
* commit 'cb32559a1ecc476a4502928b0c4e37cd0f7b836c':
Fix NetworkMonitor logging to include NetID.
|
2014-11-10 17:31:19 +00:00 |
|
Geoff Mendal
|
8f02ec4fce
|
am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'd53436a9d96100883e55e09ca3e0d5b6eae4fc35':
Import translations. DO NOT MERGE
|
2014-11-10 17:27:42 +00:00 |
|
Paul Jensen
|
cb32559a1e
|
Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev
|
2014-11-10 17:27:12 +00:00 |
|
Geoff Mendal
|
31accd1ba8
|
Merge "Import translations. DO NOT MERGE"
|
2014-11-10 17:26:59 +00:00 |
|
Andres Morales
|
0d8537ae7f
|
Fix build
Forgot to run make update-api in
https://googleplex-android-review.git.corp.google.com/#/c/582630/
Change-Id: I3c4dd253d0f1ffea8ae1b72835aee91541ed7d6f
|
2014-11-10 09:26:18 -08:00 |
|
Geoff Mendal
|
d058a7bf91
|
Merge "Import translations. DO NOT MERGE"
|
2014-11-10 17:25:53 +00:00 |
|
Alan Viverette
|
7213a52c42
|
am 82aaf332: Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev
* commit '82aaf332b62c5a276c4046d1339441d68d817371':
Update above/below backgrounds in PopupWindow.setBackground()
|
2014-11-10 17:24:38 +00:00 |
|
Geoff Mendal
|
9983d646cb
|
Import translations. DO NOT MERGE
Change-Id: Ia92402bb490311215e91b6d51c40a3e4ae51c3b1
Auto-generated-cl: translation import
|
2014-11-10 09:23:43 -08:00 |
|
Geoff Mendal
|
d53436a9d9
|
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
|
2014-11-10 17:23:38 +00:00 |
|
Geoff Mendal
|
1102d9af48
|
am 5b114e85: (-s ours) am 30a7f56c: (-s ours) am 7d447f73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '5b114e85ea46691629b16483d8519982a332b8fb':
Import translations. DO NOT MERGE
|
2014-11-10 17:22:10 +00:00 |
|
Geoff Mendal
|
d112e1e3b1
|
Import translations. DO NOT MERGE
Change-Id: Id43fa0b68b9dc1b43bed35a16e587a4d6b3a9a2f
Auto-generated-cl: translation import
|
2014-11-10 09:22:08 -08:00 |
|
Geoff Mendal
|
46524961fa
|
am deb46620: (-s ours) am c0c9b129: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'deb466201ae333fe343d7aefb69366eea8dbc48a':
Import translations. DO NOT MERGE
|
2014-11-10 17:22:06 +00:00 |
|
Alan Viverette
|
82aaf332b6
|
Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev
|
2014-11-10 17:18:49 +00:00 |
|
Geoff Mendal
|
5b114e85ea
|
am 30a7f56c: (-s ours) am 7d447f73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '30a7f56cfbb1d82b3c3269fee5f9e0bb8f5c3eb4':
Import translations. DO NOT MERGE
|
2014-11-10 17:17:38 +00:00 |
|
Geoff Mendal
|
deb466201a
|
am c0c9b129: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'c0c9b129440122b05a7245b6b624e83e9be2f93d':
Import translations. DO NOT MERGE
|
2014-11-10 17:17:33 +00:00 |
|
Geoff Mendal
|
30a7f56cfb
|
am 7d447f73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '7d447f734d334dfdd953fdcd45b38fabbeec58dc':
Import translations. DO NOT MERGE
|
2014-11-10 17:16:01 +00:00 |
|
Geoff Mendal
|
c0c9b12944
|
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
|
2014-11-10 17:14:59 +00:00 |
|
Geoff Mendal
|
fa62b15266
|
Import translations. DO NOT MERGE
Change-Id: I9f1f78c7b1589471c3a4f315d53923db92378b37
Auto-generated-cl: translation import
|
2014-11-10 09:13:39 -08:00 |
|
Geoff Mendal
|
7d447f734d
|
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
|
2014-11-10 17:12:22 +00:00 |
|
Geoff Mendal
|
0b3daeb059
|
Import translations. DO NOT MERGE
Change-Id: I174285e3b8e29495ea7128c91297450d9232b674
Auto-generated-cl: translation import
|
2014-11-10 09:10:56 -08:00 |
|
Ricardo Cervera
|
0f4c37a6cb
|
am c4d9097b: am 15da5f95: am 1e01a9f7: am abf58f98: am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs
* commit 'c4d9097b4afe848661fa2ddd735b63fd2afac433':
docs: Material design shadow fixes.
|
2014-11-10 17:09:48 +00:00 |
|
Geoff Mendal
|
1532657866
|
Import translations. DO NOT MERGE
Change-Id: I25189cd7ce81d2f1039f0121c6deaa0947bf6ec8
Auto-generated-cl: translation import
|
2014-11-10 09:07:55 -08:00 |
|
Geoff Mendal
|
7e956811fc
|
Merge "Import translations. DO NOT MERGE"
|
2014-11-10 17:06:19 +00:00 |
|
Andres Morales
|
e4aa7e7793
|
am 9e19c118: am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
* commit '9e19c118a140518859563ba81b691c6998e5084c':
Unhide DISALLOW_OUTGOING_BEAM
|
2014-11-10 17:05:20 +00:00 |
|
Geoff Mendal
|
2e8f2b5b05
|
Import translations. DO NOT MERGE
Change-Id: Ied3684129384c44a0f9c374c4b1c4f22191a3f33
Auto-generated-cl: translation import
|
2014-11-10 09:03:45 -08:00 |
|
Ricardo Cervera
|
c4d9097b4a
|
am 15da5f95: am 1e01a9f7: am abf58f98: am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs
* commit '15da5f959d59dd91c12e52dbf648ea6df2695eb1':
docs: Material design shadow fixes.
|
2014-11-10 17:03:07 +00:00 |
|