OSDN Git Service
vandwalle [Wed, 10 Sep 2014 21:26:45 +0000 (21:26 +0000)]
am
9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev
* commit '
9e444d7a905f4fbfb4e3511380d7e668d9700561':
make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
vandwalle [Wed, 10 Sep 2014 21:16:57 +0000 (21:16 +0000)]
Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev
Mathieu Chartier [Wed, 10 Sep 2014 21:05:29 +0000 (21:05 +0000)]
am
6a593012: Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev
* commit '
6a5930128cbd3fa5dace9262ee6cefa7db53d378':
Change EmptyArray System.identityHashCode to Object.hashCode.
Raph Levien [Wed, 10 Sep 2014 21:05:25 +0000 (21:05 +0000)]
am
a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev
* commit '
a31b4f03f6a98edcd8ae97900e9b1b24957ae4e0':
Remove auto spaceifying behavior on paste
Mathieu Chartier [Wed, 10 Sep 2014 21:02:25 +0000 (21:02 +0000)]
Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev
Raph Levien [Wed, 10 Sep 2014 20:55:50 +0000 (20:55 +0000)]
Merge "Remove auto spaceifying behavior on paste" into lmp-dev
Jorim Jaggi [Wed, 10 Sep 2014 20:54:06 +0000 (20:54 +0000)]
am
303fa836: Merge "Fix PIN/PUK flow" into lmp-dev
* commit '
303fa8368258ec03d8a9a6994e5c38884ed2b129':
Fix PIN/PUK flow
Jorim Jaggi [Wed, 10 Sep 2014 20:54:03 +0000 (20:54 +0000)]
am
70968134: Merge "Fix invisible Keyguard" into lmp-dev
* commit '
70968134205bcaf97076b84f5fda9ee867aa21e5':
Fix invisible Keyguard
vandwalle [Wed, 10 Sep 2014 08:32:09 +0000 (01:32 -0700)]
make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
Change-Id: I5052f6a76bcd1f980ef558bff54ce1b172319743
Jorim Jaggi [Wed, 10 Sep 2014 20:48:45 +0000 (20:48 +0000)]
Merge "Fix PIN/PUK flow" into lmp-dev
Jorim Jaggi [Wed, 10 Sep 2014 20:43:50 +0000 (20:43 +0000)]
Merge "Fix invisible Keyguard" into lmp-dev
Jon Miranda [Wed, 10 Sep 2014 20:43:05 +0000 (20:43 +0000)]
am
cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
* commit '
cfb0664eb37e09ed352991f65dc7135ba00f5fa6':
Tries to resolve reference resource names instead of its data.
Jon Miranda [Wed, 10 Sep 2014 20:34:07 +0000 (20:34 +0000)]
Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
Jae Seo [Wed, 10 Sep 2014 20:26:06 +0000 (20:26 +0000)]
am
5ea50c1a: TIF: Enable inflating class android.media.tv.TvView on non-TV devices
* commit '
5ea50c1ae245170d4c553894d98e80e1448e9389':
TIF: Enable inflating class android.media.tv.TvView on non-TV devices
Jorim Jaggi [Wed, 10 Sep 2014 20:23:08 +0000 (22:23 +0200)]
Fix invisible Keyguard
Bug:
17439581
Change-Id: Ie649af4a3455a650ab46372f1e5500b530a24f34
Svetoslav [Wed, 10 Sep 2014 20:15:52 +0000 (20:15 +0000)]
am
0f2e085d: Merge "RTL support for print UI." into lmp-dev
* commit '
0f2e085da75d003a2f3b7490dda9b9ac2aef58ba':
RTL support for print UI.
Svetoslav [Wed, 10 Sep 2014 20:15:48 +0000 (20:15 +0000)]
am
d327046d: Merge "Fix page spacing in preview list." into lmp-dev
* commit '
d327046d05f6823e5ad3ee2ee81bf3531f23bbdc':
Fix page spacing in preview list.
Jae Seo [Wed, 10 Sep 2014 20:11:13 +0000 (13:11 -0700)]
TIF: Enable inflating class android.media.tv.TvView on non-TV devices
Needed to pass the CTS for those devices.
Bug:
17455222
Change-Id: Ief9a76835418906d9e8e06d4e5ddc71a3370055d
Svetoslav [Wed, 10 Sep 2014 20:06:16 +0000 (20:06 +0000)]
Merge "RTL support for print UI." into lmp-dev
Svetoslav [Wed, 10 Sep 2014 20:05:45 +0000 (20:05 +0000)]
Merge "Fix page spacing in preview list." into lmp-dev
Mathieu Chartier [Wed, 10 Sep 2014 19:56:21 +0000 (12:56 -0700)]
Change EmptyArray System.identityHashCode to Object.hashCode.
Equivalent behavior, improves performance since
Object.hashCode has a fast path in the java side that does not
require JNI.
According to traceview sampling profiler:
Calendar had 6.8% time in System.identityHashCode during launch.
0.4% time in System.identityHashCode after the change.
Bug:
16828525
Change-Id: I1ed1d1283a990f990b0d4352cc1f4822b1dadf7b
Eino-Ville Talvala [Wed, 10 Sep 2014 19:52:53 +0000 (19:52 +0000)]
am
90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev
* commit '
90229edc689b3faebe215ce4841d1bf39d848bb5':
Camera2: Allow captures right after abort
Sailesh Nepal [Wed, 10 Sep 2014 19:52:49 +0000 (19:52 +0000)]
am
f668d735: Merge "Set remote connection state after setting handle" into lmp-dev
* commit '
f668d735e2097b0c7036dca4b6d7dcf16f5a9115':
Set remote connection state after setting handle
Eino-Ville Talvala [Wed, 10 Sep 2014 19:48:19 +0000 (19:48 +0000)]
Merge "Camera2: Allow captures right after abort" into lmp-dev
Sailesh Nepal [Wed, 10 Sep 2014 19:45:02 +0000 (19:45 +0000)]
Merge "Set remote connection state after setting handle" into lmp-dev
Robert Greenwalt [Wed, 10 Sep 2014 19:37:18 +0000 (19:37 +0000)]
am
eb843b14: Merge "Don\'t accept score below 0." into lmp-dev
* commit '
eb843b1461bba376be9dd9448bff1d8b06e25e59':
Don't accept score below 0.
Robert Greenwalt [Wed, 10 Sep 2014 19:30:21 +0000 (19:30 +0000)]
Merge "Don't accept score below 0." into lmp-dev
Robert Ly [Wed, 10 Sep 2014 18:39:12 +0000 (18:39 +0000)]
am
c56e0e50: am
0adb8bb0: am
5debe44b: am
0743bca5: docs: add 64k method limit note
* commit '
c56e0e50c9a35bdec477d99bac8c885d13a4e4dc':
docs: add 64k method limit note
Robert Ly [Wed, 10 Sep 2014 18:26:56 +0000 (18:26 +0000)]
am
0adb8bb0: am
5debe44b: am
0743bca5: docs: add 64k method limit note
* commit '
0adb8bb0a2a9bd240af55e5a1795d837a8c5f9db':
docs: add 64k method limit note
Jorim Jaggi [Wed, 10 Sep 2014 18:17:58 +0000 (20:17 +0200)]
Fix PIN/PUK flow
Bug:
17411293
Change-Id: Ib9e99ba5d982704fc0b8201aa90a664501a34b81
Robert Ly [Wed, 10 Sep 2014 18:16:12 +0000 (18:16 +0000)]
am
5debe44b: am
0743bca5: docs: add 64k method limit note
* commit '
5debe44b88e41b61ecbbc48c60a006cd6abd734d':
docs: add 64k method limit note
Matthew Williams [Wed, 10 Sep 2014 18:10:27 +0000 (18:10 +0000)]
am
3ea66322: Merge "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager" into lmp-dev
* commit '
3ea6632298fadd3e695945a2e486b52ff79a4d7b':
Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager
Matthew Williams [Wed, 10 Sep 2014 18:04:16 +0000 (18:04 +0000)]
Merge "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager" into lmp-dev
Robert Ly [Wed, 10 Sep 2014 18:04:16 +0000 (18:04 +0000)]
am
0743bca5: docs: add 64k method limit note
* commit '
0743bca58961582078f4e8199fe9a6fa044036eb':
docs: add 64k method limit note
Raph Levien [Wed, 10 Sep 2014 18:03:18 +0000 (11:03 -0700)]
Remove auto spaceifying behavior on paste
The paste action contained some logic to automatically insert or remove
spaces, basically to emulate the semantics of the text being a sequence
of space-separated words. This was never universally loved, and gives
particularly unexpected behavior with a hardware keyboard.
This patch simply removes the logic to automatically adjust spaces on
paste, so what gets pasted is simply the literal buffer contents.
Bug:
16900326
Bug:
3304489
Change-Id: I5cdf9c43d98a17aa708883b47245aa7929a124d2
Matthew Williams [Wed, 10 Sep 2014 17:53:14 +0000 (10:53 -0700)]
Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager
BUG:
17359770
Reuse the Manifest.permission.ACCOUNT_MANAGER to protect this receiver,
because when this intent lands it kicks off a sync for every account/provider
on the device.
Semantically this means "if you can't talk to an authenticator to do things like
get a token or add an account, then you can't send an intent to the SyncManager
that the accounts on the device have changed in some drastic way"
Change-Id: I7eccc38e135cb00ebb0aafc69afc802fe1c4f219
Jeff Davidson [Wed, 10 Sep 2014 17:53:11 +0000 (17:53 +0000)]
am
cfd0e5c1: Merge "Update unclear Fragment Javadoc." into lmp-dev
* commit '
cfd0e5c15a752fec962bee3b82b10cf95bb90315':
Update unclear Fragment Javadoc.
Robert Ly [Wed, 10 Sep 2014 17:50:46 +0000 (10:50 -0700)]
docs: add 64k method limit note
Change-Id: I6590fc996331c1f2024276d338c4035f2cb0f18d
Jeff Davidson [Wed, 10 Sep 2014 17:46:20 +0000 (17:46 +0000)]
Merge "Update unclear Fragment Javadoc." into lmp-dev
Robert Greenwalt [Tue, 9 Sep 2014 21:46:37 +0000 (14:46 -0700)]
Don't accept score below 0.
Network Factories are allowed to go below, but networks need to be
constrained. Allowing the network to go below 0 meant that -1 could
sometimes leak through and foul the logic.
The core of
17361330 will be fixed when we stop sending scores for
listens to NetworkFactories, but it exposed this issue too. Summary:
1 - add a network listener. This isn't a request so it's not sent
to networks.
2 - alter your score (ethernet sets score to -1 when the link goes
down) (16:07:39.782)
3 - a bug in ConnectivityService causes score changes to get sent for
all network requests and network listeners causing NetworkFactories
to no see 2 entities. This bug will be fixed by a pending change
(https://googleplex-android-review.googlesource.com/#/c/540840/).
This causes the ethernet NetworkFactory to see two entities, both
served by networks of score -1. (16:07:39.989)
4 - disconnect Ethernet - this only sends 0 scores for known
requests, not network listeners. Had it been sent for both entities
they both would have evaluated that the networkfactory score (-1)
was lower than the request score (0) and both released their
refcount. (16:08:03.147)
5 - this means the listener is tracked by the EthernetNetworkFactory
with a score of -1 while the factory itself has a score of -1 so the
network release isn't called.
bug:
17361330
Change-Id: Ife34ca0f9c233dd3c3df80f6fea580af43afcdeb
Jean-Michel Trivi [Wed, 10 Sep 2014 17:32:02 +0000 (17:32 +0000)]
am
6fa0947a: Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev
* commit '
6fa0947a589d193b95097e7bb966cdb80eb49a53':
Virtualizer: replace device type by virtualization mode
Eric Laurent [Wed, 10 Sep 2014 17:31:51 +0000 (17:31 +0000)]
am
c5db63b6: Merge "Hide AudioDevice class" into lmp-dev
* commit '
c5db63b67a64b8319ce35a4e83770db6a5367fbe':
Hide AudioDevice class
Jorim Jaggi [Wed, 10 Sep 2014 17:31:47 +0000 (17:31 +0000)]
am
bf763e77: Merge "Remove some overdraw in Keyguard" into lmp-dev
* commit '
bf763e77177f172dcb1d7590dd1855d53ff0d2e5':
Remove some overdraw in Keyguard
Jorim Jaggi [Wed, 10 Sep 2014 17:31:43 +0000 (17:31 +0000)]
am
07291645: Merge "Fix QS interception on tablets" into lmp-dev
* commit '
07291645ca6479b6ba8f83c95c137602dfd20ddb':
Fix QS interception on tablets
Jean-Michel Trivi [Wed, 10 Sep 2014 17:29:18 +0000 (17:29 +0000)]
Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev
Eric Laurent [Wed, 10 Sep 2014 17:28:54 +0000 (17:28 +0000)]
Merge "Hide AudioDevice class" into lmp-dev
Jorim Jaggi [Wed, 10 Sep 2014 17:22:51 +0000 (17:22 +0000)]
Merge "Remove some overdraw in Keyguard" into lmp-dev
Jorim Jaggi [Wed, 10 Sep 2014 17:22:41 +0000 (17:22 +0000)]
Merge "Fix QS interception on tablets" into lmp-dev
Ruben Brunk [Wed, 10 Sep 2014 17:20:58 +0000 (17:20 +0000)]
am
17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev
* commit '
17fcb2556b1c04a42398738dcc1ad491b3597aa7':
camera2: Fix preview stretching in LEGACY mode.
Ruben Brunk [Wed, 10 Sep 2014 17:11:20 +0000 (17:11 +0000)]
Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev
Esteban Talavera [Wed, 10 Sep 2014 17:06:45 +0000 (17:06 +0000)]
am
55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev
* commit '
55bffb5041e18f2cf6884841165c2bbaf9576b98':
Update string value for provisioning action and extra
Jorim Jaggi [Wed, 10 Sep 2014 17:06:41 +0000 (17:06 +0000)]
am
bf671114: Merge "Don\'t let two closing animations run at the same time" into lmp-dev
* commit '
bf671114aa8cd713ff915dbd1403e077821c07f8':
Don't let two closing animations run at the same time
Jorim Jaggi [Wed, 10 Sep 2014 16:52:29 +0000 (18:52 +0200)]
Remove some overdraw in Keyguard
Bug:
17287256
Change-Id: I0bc4101713f83abc2738528c247ca8ce5748bff1
Esteban Talavera [Wed, 10 Sep 2014 16:26:48 +0000 (16:26 +0000)]
Merge "Update string value for provisioning action and extra" into lmp-dev
Jorim Jaggi [Wed, 10 Sep 2014 16:20:58 +0000 (18:20 +0200)]
Fix QS interception on tablets
Only intercept when touching on the panel and not on the left or
right of the panel. Fixes a bug where the user couldn't dismiss the
panel by tapping outside.
Bug:
17437547
Change-Id: Ice484a301683fa2df1f2a21f13977023b48189f4
Jorim Jaggi [Wed, 10 Sep 2014 15:48:44 +0000 (15:48 +0000)]
Merge "Don't let two closing animations run at the same time" into lmp-dev
Selim Cinek [Wed, 10 Sep 2014 15:10:36 +0000 (15:10 +0000)]
am
abe5f130: Merge "Fixed unnecessary layer creations in the pin unlock method" into lmp-dev
* commit '
abe5f1300b333b9120d7d120b0cec6cca96b778f':
Fixed unnecessary layer creations in the pin unlock method
Jason Monk [Wed, 10 Sep 2014 15:10:32 +0000 (15:10 +0000)]
am
89551fab: Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev
* commit '
89551fab5725e7c67002f894bdf8933c00a9c409':
Fix blank QS Panel after double tap on profile icon
Jason Monk [Wed, 10 Sep 2014 15:10:28 +0000 (15:10 +0000)]
am
1c52586c: Merge "Update zen mode and qs strings on locale change" into lmp-dev
* commit '
1c52586cb3273f419d9e70a884823c411abacf73':
Update zen mode and qs strings on locale change
Jason Monk [Wed, 10 Sep 2014 15:10:24 +0000 (15:10 +0000)]
am
473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev
* commit '
473d27fa34875083dfea48e933c2e9300979c64a':
Move zen mode constants and code to framework
Selim Cinek [Wed, 10 Sep 2014 15:08:32 +0000 (15:08 +0000)]
Merge "Fixed unnecessary layer creations in the pin unlock method" into lmp-dev
Jorim Jaggi [Wed, 10 Sep 2014 15:04:27 +0000 (17:04 +0200)]
Don't let two closing animations run at the same time
Fixes a flash when clicking on a single notification.
Bug:
17450892
Change-Id: Ia99c21a0bb30ce100532cfab66c96ec24f2412bf
Jason Monk [Wed, 10 Sep 2014 15:00:53 +0000 (15:00 +0000)]
Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev
Jason Monk [Wed, 10 Sep 2014 15:00:30 +0000 (15:00 +0000)]
Merge "Update zen mode and qs strings on locale change" into lmp-dev
Jason Monk [Wed, 10 Sep 2014 15:00:19 +0000 (15:00 +0000)]
Merge "Move zen mode constants and code to framework" into lmp-dev
John Spurlock [Wed, 10 Sep 2014 14:54:35 +0000 (14:54 +0000)]
am
82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev
* commit '
821268455ca57051983c0e5f8cc24695033be174':
Zen: make Condition available over @SystemApi
John Spurlock [Wed, 10 Sep 2014 14:46:19 +0000 (14:46 +0000)]
Merge "Zen: make Condition available over @SystemApi" into lmp-dev
John Spurlock [Wed, 10 Sep 2014 14:42:13 +0000 (10:42 -0400)]
Zen: make Condition available over @SystemApi
Fix build.
Bug:
16819503
Change-Id: I011723a770a9a8b7fc8124defd56137ec5f1704e
Selim Cinek [Wed, 10 Sep 2014 14:39:01 +0000 (16:39 +0200)]
Fixed unnecessary layer creations in the pin unlock method
This was especially noticible when double tapping a notification
because of the staggered appearing.
Bug:
17287256
Change-Id: I8f39892fa122bb8b7b6f2a7b1e7be8a9570e661e
George Mount [Wed, 10 Sep 2014 14:38:19 +0000 (14:38 +0000)]
am
1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev
* commit '
1fac2ba1c9577f88cf93e88794780af9b5eacb1b':
Use intrinsic size for path animation in AnimatedVectorDrawable
George Mount [Wed, 10 Sep 2014 14:38:15 +0000 (14:38 +0000)]
am
bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev
* commit '
bfbb5882cb2e11d9a201e4f5ade6a3fe9f43e6b0':
Fix fade transition not working with Activity Transitions.
George Mount [Wed, 10 Sep 2014 14:30:15 +0000 (14:30 +0000)]
Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev
George Mount [Wed, 10 Sep 2014 14:29:58 +0000 (14:29 +0000)]
Merge "Fix fade transition not working with Activity Transitions." into lmp-dev
John Spurlock [Wed, 10 Sep 2014 13:45:09 +0000 (13:45 +0000)]
am
3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev
* commit '
3a972844e934b1031d73bfb114d84a7d2f8d4b19':
Zen: Make condition providers available via @SystemApi.
Selim Cinek [Wed, 10 Sep 2014 13:45:00 +0000 (13:45 +0000)]
am
20c285a6: Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev
* commit '
20c285a6485e57669eae5a9ea165b390f0d8369c':
Fixed a bug where text could overlap in Quick settings
John Spurlock [Wed, 10 Sep 2014 13:38:08 +0000 (13:38 +0000)]
Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev
Selim Cinek [Wed, 10 Sep 2014 13:36:17 +0000 (13:36 +0000)]
Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev
Jason Monk [Mon, 8 Sep 2014 14:13:59 +0000 (10:13 -0400)]
Move zen mode constants and code to framework
This allows the strings and code to be shared with settings.
Bug:
15454830
Change-Id: I9300af4f8b6d80042452b75db3418b20c5c5cc81
John Spurlock [Wed, 10 Sep 2014 13:10:00 +0000 (09:10 -0400)]
Zen: Make condition providers available via @SystemApi.
Bug:
16819503
Change-Id: Ibd7004f7a0928d3f14f9ccd55088cf645d5285e2
Jorim Jaggi [Wed, 10 Sep 2014 13:11:51 +0000 (13:11 +0000)]
am
2f52f74c: Merge "Use simpler layout for auto-redacted notifications" into lmp-dev
* commit '
2f52f74c4a670370e32b36ecb89a06f5203df8d1':
Use simpler layout for auto-redacted notifications
Jorim Jaggi [Wed, 10 Sep 2014 13:11:47 +0000 (13:11 +0000)]
am
222ff70d: Merge "Inflate guts only when needed" into lmp-dev
* commit '
222ff70d04bd1e3721d455cd42ce36f046b52b93':
Inflate guts only when needed
Jorim Jaggi [Wed, 10 Sep 2014 13:03:29 +0000 (13:03 +0000)]
Merge "Use simpler layout for auto-redacted notifications" into lmp-dev
Jorim Jaggi [Wed, 10 Sep 2014 13:03:05 +0000 (13:03 +0000)]
Merge "Inflate guts only when needed" into lmp-dev
Jorim Jaggi [Mon, 8 Sep 2014 17:55:17 +0000 (19:55 +0200)]
Inflate guts only when needed
This saves us a ton of views.
Bug:
17346296
Change-Id: I3eafd6703d19704dc8b108c1034266f38cf77f7b
Selim Cinek [Wed, 10 Sep 2014 12:41:58 +0000 (14:41 +0200)]
Fixed a bug where text could overlap in Quick settings
Bug:
17434395
Change-Id: I001f54586666e2e575b0295315f7b2181c25a1e9
Adrian Roos [Wed, 10 Sep 2014 11:32:11 +0000 (11:32 +0000)]
am
500eebbb: Merge "Only unbind agents of the user that is being refreshed" into lmp-dev
* commit '
500eebbb71d64c5b4d4b6ef4ab2f10800ac455df':
Only unbind agents of the user that is being refreshed
Adrian Roos [Wed, 10 Sep 2014 11:32:07 +0000 (11:32 +0000)]
am
be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev
* commit '
be12538056cf441f441d42d2bf7d430ecdc3fd4f':
Add system trust agents on first boot or when adding user
Adrian Roos [Wed, 10 Sep 2014 11:24:07 +0000 (11:24 +0000)]
Merge "Only unbind agents of the user that is being refreshed" into lmp-dev
Adrian Roos [Wed, 10 Sep 2014 11:23:37 +0000 (11:23 +0000)]
Merge "Add system trust agents on first boot or when adding user" into lmp-dev
Kenny Guy [Wed, 10 Sep 2014 11:22:10 +0000 (11:22 +0000)]
am
cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev
* commit '
cefee0c8185594f017ffd396cfe1877419c24371':
Remember userId when stripping / rebuilding notification.
Christoph Studer [Wed, 10 Sep 2014 11:22:06 +0000 (11:22 +0000)]
am
6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev
* commit '
6e68dff3deb0ec350aa769b4936e52ea00262beb':
NoLiService: Delete @removed meetsInterruptionFilter
Christoph Studer [Wed, 10 Sep 2014 11:22:02 +0000 (11:22 +0000)]
am
c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev
* commit '
c4290acf31f537821c42356d8a5db22afd353d1c':
Notification: Use ViewStub for ProgressBar
Kenny Guy [Wed, 10 Sep 2014 11:14:57 +0000 (11:14 +0000)]
Merge "Remember userId when stripping / rebuilding notification." into lmp-dev
Christoph Studer [Wed, 10 Sep 2014 11:14:32 +0000 (11:14 +0000)]
Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev
Christoph Studer [Wed, 10 Sep 2014 11:14:07 +0000 (11:14 +0000)]
Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev
Adam Connors [Wed, 10 Sep 2014 10:16:38 +0000 (10:16 +0000)]
am
5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
* commit '
5e1fe70f82a58b3afe87ed14f5c44e02e05ddccb':
Add feature flags for verified boot and securely remove users.
Adam Connors [Wed, 10 Sep 2014 10:07:13 +0000 (10:07 +0000)]
Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
Yohei Yukawa [Wed, 10 Sep 2014 09:16:04 +0000 (09:16 +0000)]
am
107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev
* commit '
107505bd85f615c82a1dca462581f8b10de72270':
Use public APIs to instantiate InputMethodSubtype
Jessica Hummel [Wed, 10 Sep 2014 09:16:00 +0000 (09:16 +0000)]
am
1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev
* commit '
1e4efc916adb2e62f1189a6f1d8c54f8970a31f6':
Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
Yohei Yukawa [Wed, 10 Sep 2014 08:29:29 +0000 (08:29 +0000)]
Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev