OSDN Git Service
Katie McCormick [Fri, 14 Mar 2014 16:36:14 +0000 (16:36 +0000)]
am
9c5c5a87: am
8e142bbb: am
b681794d: am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
9c5c5a874a2453a9684ad56739f1a779f04e66db':
Doc update: new doc studio layout editor
John Spurlock [Fri, 14 Mar 2014 16:36:11 +0000 (16:36 +0000)]
am
399cac5b: am
75985bbe: am
62826f55: am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
399cac5b335b7a0a0c0146c6de8b653382caae6a':
Fix doc typos in AppOpsManager.java
JP Abgrall [Fri, 14 Mar 2014 16:36:08 +0000 (16:36 +0000)]
am
7238585e: am
4f261396: am
4ecd833e: am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
7238585e2eea81d416e3e98c283e99c3a9a38a1a':
ConnectivityService: add support to set TCP initial rwnd
Chad Brubaker [Fri, 14 Mar 2014 16:36:04 +0000 (16:36 +0000)]
am
4b59883a: am
7c2b1625: am
78f204ae: am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
4b59883afd498dd993263c95aa6db84cbe7c49b4':
Remove SO_BINDTODEVICE from VPN protect
Svetoslav [Fri, 14 Mar 2014 16:36:01 +0000 (16:36 +0000)]
am
90119082: am
358eaa78: am
fc1d0471: am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
9011908230e8c91a580b3ceec2e91059460fe5fb':
PrintSpooler crash if printer is reported to have only one color mode.
Adrian Roos [Fri, 14 Mar 2014 16:35:59 +0000 (16:35 +0000)]
am
d590516b: am
70a0ea0e: am
16858164: am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
d590516b673e1a319099d8d009706d42a61877e0':
DO NOT MERGE - Fix keyguard pattern lockout bug
Baligh Uddin [Fri, 14 Mar 2014 16:35:56 +0000 (16:35 +0000)]
am
63492522: (-s ours) am
46bfaa1b: (-s ours) am
a5a921e3: (-s ours) am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
634925222ad4528984bf35b9b2316db9a227d51c':
Import translations. DO NOT MERGE
Dianne Hackborn [Fri, 14 Mar 2014 16:35:53 +0000 (16:35 +0000)]
am
f29a4981: am
d4981014: am
e5191aab: am
a796168d: Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit '
f29a4981616c05f300b582eb09d48ed81c97dd37':
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
Jeff Brown [Fri, 14 Mar 2014 16:35:51 +0000 (16:35 +0000)]
am
88768cc3: am
6adc9602: am
825dd9dd: am
73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '
88768cc35789638f16b5a1a9c9de99eb4f6cd408':
Retain display when creating specialized contexts. (DO NOT MERGE)
Katie McCormick [Fri, 14 Mar 2014 16:32:27 +0000 (16:32 +0000)]
am
8e142bbb: am
b681794d: am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
8e142bbbe19c2f485033eace102d2e950ceeb4fb':
Doc update: new doc studio layout editor
John Spurlock [Fri, 14 Mar 2014 16:32:24 +0000 (16:32 +0000)]
am
75985bbe: am
62826f55: am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
75985bbe2f04519cc663db7ad54e8e69f3eabfc0':
Fix doc typos in AppOpsManager.java
JP Abgrall [Fri, 14 Mar 2014 16:32:21 +0000 (16:32 +0000)]
am
4f261396: am
4ecd833e: am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
4f26139661b0039cff5e570975e6bf9b0bbce1af':
ConnectivityService: add support to set TCP initial rwnd
Chad Brubaker [Fri, 14 Mar 2014 16:32:18 +0000 (16:32 +0000)]
am
7c2b1625: am
78f204ae: am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
7c2b1625d66d3c80c313160f78c8bccd9499539e':
Remove SO_BINDTODEVICE from VPN protect
Svetoslav [Fri, 14 Mar 2014 16:32:15 +0000 (16:32 +0000)]
am
358eaa78: am
fc1d0471: am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
358eaa7825140ee571a7b9d61705fb3adb5b60aa':
PrintSpooler crash if printer is reported to have only one color mode.
Adrian Roos [Fri, 14 Mar 2014 16:32:12 +0000 (16:32 +0000)]
am
70a0ea0e: am
16858164: am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
70a0ea0e8de981a2a0c3fb296718256a2355ee2d':
DO NOT MERGE - Fix keyguard pattern lockout bug
Baligh Uddin [Fri, 14 Mar 2014 16:32:05 +0000 (16:32 +0000)]
am
46bfaa1b: (-s ours) am
a5a921e3: (-s ours) am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
46bfaa1b93068c78ea5a2ab337ea8b98592b7c10':
Import translations. DO NOT MERGE
Dianne Hackborn [Fri, 14 Mar 2014 16:32:02 +0000 (16:32 +0000)]
am
d4981014: am
e5191aab: am
a796168d: Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit '
d4981014d486c3ff72813d0d37048ee2abdb3d63':
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
Jeff Brown [Fri, 14 Mar 2014 16:31:59 +0000 (16:31 +0000)]
am
6adc9602: am
825dd9dd: am
73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '
6adc96020f763289d2e2a33b612f2ff237fb40b6':
Retain display when creating specialized contexts. (DO NOT MERGE)
Katie McCormick [Fri, 14 Mar 2014 16:28:18 +0000 (16:28 +0000)]
am
b681794d: am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
b681794d2583e06693c23eec1af4e282b067abd9':
Doc update: new doc studio layout editor
John Spurlock [Fri, 14 Mar 2014 16:28:15 +0000 (16:28 +0000)]
am
62826f55: am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
62826f55be4415684b4e321469298ba43d598bbb':
Fix doc typos in AppOpsManager.java
JP Abgrall [Fri, 14 Mar 2014 16:28:09 +0000 (16:28 +0000)]
am
4ecd833e: am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
4ecd833ee35d1120f8c1ae52367947cacfc263a4':
ConnectivityService: add support to set TCP initial rwnd
Chad Brubaker [Fri, 14 Mar 2014 16:27:58 +0000 (16:27 +0000)]
am
78f204ae: am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
78f204aed8c0f3c8174616801d66f96a9a00a5fd':
Remove SO_BINDTODEVICE from VPN protect
Svetoslav [Fri, 14 Mar 2014 16:27:55 +0000 (16:27 +0000)]
am
fc1d0471: am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
fc1d04714e9042a1b01c7a725fafa1820b8c14fb':
PrintSpooler crash if printer is reported to have only one color mode.
Adrian Roos [Fri, 14 Mar 2014 16:27:51 +0000 (16:27 +0000)]
am
16858164: am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
16858164c73f0696d12161e97bad9cb22c55e603':
DO NOT MERGE - Fix keyguard pattern lockout bug
Baligh Uddin [Fri, 14 Mar 2014 16:27:44 +0000 (16:27 +0000)]
am
a5a921e3: (-s ours) am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a5a921e3a80eddd4622dd4d2d1c91d5ee71583f5':
Import translations. DO NOT MERGE
Dianne Hackborn [Fri, 14 Mar 2014 16:27:40 +0000 (16:27 +0000)]
am
e5191aab: am
a796168d: Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit '
e5191aabff5b9b751349b8634836a858af744905':
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
Jeff Brown [Fri, 14 Mar 2014 16:27:35 +0000 (16:27 +0000)]
am
825dd9dd: am
73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '
825dd9dd38a42306d18a627768b16204cf4d8710':
Retain display when creating specialized contexts. (DO NOT MERGE)
Zhihai Xu [Fri, 14 Mar 2014 16:08:38 +0000 (16:08 +0000)]
am
6d3d6c4a: am
57080be9: am
bdd4c31a: am
60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '
6d3d6c4a06a1e83d126622d8a971f439b80ec354':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Zhihai Xu [Fri, 14 Mar 2014 16:01:00 +0000 (16:01 +0000)]
am
57080be9: am
bdd4c31a: am
60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '
57080be98e6c8d33781c619b79731264ab909baf':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Zhihai Xu [Fri, 14 Mar 2014 15:56:47 +0000 (15:56 +0000)]
am
bdd4c31a: am
60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '
bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Narayan Kamath [Fri, 14 Mar 2014 14:25:58 +0000 (14:25 +0000)]
am
63938750: am
c0232642: am
629daddd: Merge "Fix layoutlib build."
* commit '
6393875024e3b2ee6916d718d79dfbeb722537c1':
Fix layoutlib build.
Narayan Kamath [Fri, 14 Mar 2014 14:22:30 +0000 (14:22 +0000)]
am
c0232642: am
629daddd: Merge "Fix layoutlib build."
* commit '
c0232642b74517aa2717673f0811ba65c620f491':
Fix layoutlib build.
Narayan Kamath [Fri, 14 Mar 2014 14:19:24 +0000 (07:19 -0700)]
am
629daddd: Merge "Fix layoutlib build."
* commit '
629daddd03b598616de7c30a13b1f9f9b11b98fe':
Fix layoutlib build.
Narayan Kamath [Fri, 14 Mar 2014 14:12:35 +0000 (14:12 +0000)]
Merge "Fix layoutlib build."
Narayan Kamath [Fri, 14 Mar 2014 14:10:30 +0000 (14:10 +0000)]
Fix layoutlib build.
Was using private data structures from libcore.
Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
Jeff Brown [Fri, 14 Mar 2014 06:11:02 +0000 (06:11 +0000)]
am
d8b17079: am
6ae4d53b: resolved conflicts for merge of
db3146c0 to klp-modular-dev
* commit '
d8b170799f1cb00825a4a947901d4b214d20c5a1':
Fix power manager display wake lock bugs. (DO NOT MERGE)
Jeff Brown [Fri, 14 Mar 2014 04:12:08 +0000 (04:12 +0000)]
am
6ae4d53b: resolved conflicts for merge of
db3146c0 to klp-modular-dev
* commit '
6ae4d53b571cb71cc6c2ad55d12679d22e9334d5':
Fix power manager display wake lock bugs. (DO NOT MERGE)
Jeff Brown [Fri, 14 Mar 2014 04:07:33 +0000 (21:07 -0700)]
resolved conflicts for merge of
db3146c0 to klp-modular-dev
Change-Id: I1500228392add2de325b9530ae33d7c3e738c021
Adam Powell [Thu, 13 Mar 2014 23:59:57 +0000 (23:59 +0000)]
am
6cde6c75: am
41685ce9: am
898d6d96: am
7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '
6cde6c75b3469b7f76343ef7fc646f65c8393a17':
Add a config override for ViewConfiguration#hasPermanentMenuKey
Adam Powell [Thu, 13 Mar 2014 23:57:19 +0000 (23:57 +0000)]
am
41685ce9: am
898d6d96: am
7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '
41685ce983abd6b4ccbb0ae8043d6a1dc118f7d3':
Add a config override for ViewConfiguration#hasPermanentMenuKey
Adam Powell [Thu, 13 Mar 2014 23:53:38 +0000 (23:53 +0000)]
am
898d6d96: am
7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '
898d6d964cb3b650b5c9bed2276310547e5455e0':
Add a config override for ViewConfiguration#hasPermanentMenuKey
Dave Platt [Thu, 13 Mar 2014 23:47:32 +0000 (23:47 +0000)]
am
e4e6b3cc: am
21384faa: am
f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit '
e4e6b3cc1908c60bd0e45063116cf935b7aad56a':
NsdService does not clean up after exiting clients
Brian Carlstrom [Thu, 13 Mar 2014 23:43:37 +0000 (23:43 +0000)]
am
00d115a7: resolved conflicts for merge of
aa737c49 to klp-modular-dev-plus-aosp
* commit '
00d115a7533df23027f671c90c0ae52684392e4a':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
Dave Platt [Thu, 13 Mar 2014 23:42:03 +0000 (23:42 +0000)]
am
21384faa: am
f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit '
21384faa2b3da619a54b35f15936c00593b30694':
NsdService does not clean up after exiting clients
Dave Platt [Thu, 13 Mar 2014 23:38:59 +0000 (16:38 -0700)]
am
f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit '
f3a2895a31069a7c01c69d011b290fcfb3298b3c':
NsdService does not clean up after exiting clients
Dave Platt [Thu, 13 Mar 2014 23:35:15 +0000 (23:35 +0000)]
Merge "NsdService does not clean up after exiting clients"
Brian Carlstrom [Thu, 13 Mar 2014 23:31:14 +0000 (16:31 -0700)]
resolved conflicts for merge of
aa737c49 to klp-modular-dev-plus-aosp
Change-Id: I1f4e555773fe6138efaf73444525da0f747b01d5
Dave Platt [Fri, 7 Mar 2014 22:48:22 +0000 (14:48 -0800)]
NsdService does not clean up after exiting clients
When a client of the NsdService exits, NsdService should
clean up the requests it has sent to the mDNS daemon:
cancel any pending resource-discovery and resource-resolution
queries, and remove any services registered by this client.
If this isn't done, several bad things happen. The daemon will
continue to run unnecessarily, will report service discoveries
that can't be forwarded on to the client, and will continue to
advertise service ports for an application which is no longer
running until the device is rebooted (mDNS pollution).
Bug:
9801184
Change-Id: I0aa7311480322aefcff16f902fbbf34f50985d38
Katie McCormick [Thu, 13 Mar 2014 22:15:01 +0000 (22:15 +0000)]
am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
07c0ad973a2fdd8a35b3627e69f1134673c8b8e0':
Doc update: new doc studio layout editor
John Spurlock [Thu, 13 Mar 2014 22:14:57 +0000 (22:14 +0000)]
am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
f6228d95eae7b05dd0015b3062e72c89148e65a2':
Fix doc typos in AppOpsManager.java
JP Abgrall [Thu, 13 Mar 2014 20:36:51 +0000 (20:36 +0000)]
am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
7baa7c804501b9cbcb5de281c5ddfaf03ba08f7a':
ConnectivityService: add support to set TCP initial rwnd
JP Abgrall [Thu, 13 Mar 2014 20:33:43 +0000 (20:33 +0000)]
Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
Naofumi Harada [Thu, 13 Mar 2014 18:30:31 +0000 (18:30 +0000)]
am
107041e2: am
03263ce3: am
3b182261: am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
107041e299a48f9624bf7a70c003effac1c363ce':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Thu, 13 Mar 2014 18:30:28 +0000 (18:30 +0000)]
am
48dd8b0f: am
74f99a4e: am
7fb07438: am
674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '
48dd8b0fc0090ebf6cef0a9ac045fc480dd31397':
Only allow System apps to make VPN exempt routes
Chad Brubaker [Thu, 13 Mar 2014 18:30:25 +0000 (18:30 +0000)]
am
7f68f7f4: am
f5729a6a: am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
7f68f7f4a128538c1bbd33c82a40f0cc15994bf9':
Add the calling package name to requestRouteToHost
Naofumi Harada [Thu, 13 Mar 2014 18:23:03 +0000 (18:23 +0000)]
am
03263ce3: am
3b182261: am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
03263ce38aaca11300595af19d313a9f6e3ead96':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Thu, 13 Mar 2014 18:23:00 +0000 (18:23 +0000)]
am
74f99a4e: am
7fb07438: am
674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '
74f99a4e904af56a62f86b81831c23c763b6001e':
Only allow System apps to make VPN exempt routes
Chad Brubaker [Thu, 13 Mar 2014 18:22:57 +0000 (18:22 +0000)]
am
f5729a6a: am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
f5729a6a1573ba27f69a5c5dc144be3f8f60b026':
Add the calling package name to requestRouteToHost
Narayan Kamath [Thu, 13 Mar 2014 18:18:48 +0000 (18:18 +0000)]
am
9af19bee: am
52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt.
* commit '
9af19bee1c7da8d2e8bc6e40c6e9c1e28e0640c6':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
Naofumi Harada [Thu, 13 Mar 2014 18:18:45 +0000 (18:18 +0000)]
am
3b182261: am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
3b18226133f27a5fe9e18f7da17d4cd0d0fa0471':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Thu, 13 Mar 2014 18:18:40 +0000 (18:18 +0000)]
am
7fb07438: am
674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '
7fb074389370ac93afc5830189371dc3ec26265c':
Only allow System apps to make VPN exempt routes
Chad Brubaker [Thu, 13 Mar 2014 18:18:36 +0000 (18:18 +0000)]
am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
1011960c44a4f84d53d05199fe1ca09be9473822':
Add the calling package name to requestRouteToHost
Chad Brubaker [Thu, 13 Mar 2014 18:12:36 +0000 (18:12 +0000)]
am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac':
Remove SO_BINDTODEVICE from VPN protect
Chad Brubaker [Thu, 13 Mar 2014 18:09:57 +0000 (18:09 +0000)]
Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
Jose Lima [Thu, 13 Mar 2014 18:08:51 +0000 (18:08 +0000)]
am
53ac5ef2: am
91726f4e: Merge "Add banner attribute to app manifest" into klp-modular-dev
* commit '
53ac5ef2141c7e7d99d5c00195bc65e86e7fc403':
Add banner attribute to app manifest
Christopher Tate [Thu, 13 Mar 2014 18:08:49 +0000 (18:08 +0000)]
am
d5b25cbd: am
aaaeb6a2: am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
d5b25cbd570680c361da8807fdfddf135472d338':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Thu, 13 Mar 2014 18:08:46 +0000 (18:08 +0000)]
am
c48e3d03: (-s ours) am
4c9ebc4c: (-s ours) am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c48e3d03436bd428ef5425114ea138ae097f1f20':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 13 Mar 2014 18:08:43 +0000 (18:08 +0000)]
am
d7cc4bf4: am
cf2b65ce: am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
d7cc4bf482d69d146eb5386b790816c8a46f278a':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Thu, 13 Mar 2014 18:08:40 +0000 (18:08 +0000)]
am
839321a3: am
c25dbb50: am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
839321a362ec1cd40fc7267a7883641bcc8ee429':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Thu, 13 Mar 2014 18:08:37 +0000 (18:08 +0000)]
am
ba3d0fd5: am
af6288b7: am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
ba3d0fd5fc520d1a6dcf6e6abc5f9d90c08e9f88':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Thu, 13 Mar 2014 18:08:34 +0000 (18:08 +0000)]
am
4a5c9e94: am
68ec033b: am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
4a5c9e941a78299d869b4c9d916fd86187057150':
Fix a bug in submenu presenter priority handling
Jason Sams [Thu, 13 Mar 2014 18:08:31 +0000 (18:08 +0000)]
am
276565c8: am
0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
* commit '
276565c83c05e24819454dea4008ad5096792e4f':
Force merge of remaining KLP changes to fix build.
Jose Lima [Thu, 13 Mar 2014 18:02:50 +0000 (18:02 +0000)]
am
91726f4e: Merge "Add banner attribute to app manifest" into klp-modular-dev
* commit '
91726f4ea7b60025490209ccb2637d712e8d75fd':
Add banner attribute to app manifest
Christopher Tate [Thu, 13 Mar 2014 18:02:45 +0000 (18:02 +0000)]
am
aaaeb6a2: am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
aaaeb6a21bb6cc540fefa6868493bda612a63f22':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Thu, 13 Mar 2014 18:02:42 +0000 (18:02 +0000)]
am
4c9ebc4c: (-s ours) am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4c9ebc4c149627e4ea0ee82f053628021ef8bfe8':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 13 Mar 2014 18:02:17 +0000 (18:02 +0000)]
am
cf2b65ce: am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
cf2b65ce7a5a1d60755a00ae4da6cd6b1101af8c':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Thu, 13 Mar 2014 18:02:14 +0000 (18:02 +0000)]
am
c25dbb50: am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
c25dbb50c30816c97227b9a26cc46afec4e5318e':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Thu, 13 Mar 2014 18:02:11 +0000 (18:02 +0000)]
am
af6288b7: am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
af6288b721110ffc4b4e68d55398b5ca31fc32e8':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Thu, 13 Mar 2014 18:02:08 +0000 (18:02 +0000)]
am
68ec033b: am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
68ec033b7c9ea28155bbb007b01d5dbce2239392':
Fix a bug in submenu presenter priority handling
Jason Sams [Thu, 13 Mar 2014 18:02:03 +0000 (18:02 +0000)]
am
0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
* commit '
0ebc6b378dca76b3253b10cf17c3a38a0a50c073':
Force merge of remaining KLP changes to fix build.
Jose Lima [Thu, 13 Mar 2014 17:40:36 +0000 (17:40 +0000)]
Merge "Add banner attribute to app manifest" into klp-modular-dev
Svetoslav [Thu, 13 Mar 2014 17:31:03 +0000 (17:31 +0000)]
am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
11b7d9fa6685e742f5b3e3235a8e6e4920dbed02':
PrintSpooler crash if printer is reported to have only one color mode.
Svetoslav [Thu, 13 Mar 2014 17:26:44 +0000 (17:26 +0000)]
Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
Adrian Roos [Thu, 13 Mar 2014 17:26:26 +0000 (17:26 +0000)]
am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Thu, 13 Mar 2014 17:22:58 +0000 (17:22 +0000)]
Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
Christopher Tate [Thu, 13 Mar 2014 17:19:17 +0000 (17:19 +0000)]
am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
87503f8561296fea489f8a3fe8384f61150976da':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Thu, 13 Mar 2014 17:19:14 +0000 (17:19 +0000)]
am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:25:45 +0000 (16:25 +0000)]
am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4545b1d29b23cbfe11aa7ca6b54f6518a38db278':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:22:52 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Adrian Roos [Mon, 10 Mar 2014 16:00:11 +0000 (17:00 +0100)]
DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit
7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
Bug:
13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
Jason Sams [Thu, 13 Mar 2014 10:53:01 +0000 (10:53 +0000)]
am
35a9e339: am
fc15f899: Fix build issues from bad merge
* commit '
35a9e339687a0c5423c3433ff0c335ad9e1e0656':
Fix build issues from bad merge
Jason Sams [Thu, 13 Mar 2014 10:52:56 +0000 (10:52 +0000)]
am
534606b4: am
632c915c: resolved conflicts for merge of
780d57b8 to klp-modular-dev
* commit '
534606b44a865874b00fba24517a8e218ec56075':
Fix destruction issues relating to AllocationAdapter.
Jason Sams [Thu, 13 Mar 2014 10:50:19 +0000 (10:50 +0000)]
am
fc15f899: Fix build issues from bad merge
* commit '
fc15f899b86aa39bd32e3d38a9f5369ee8f0e2c8':
Fix build issues from bad merge
Jason Sams [Thu, 13 Mar 2014 10:50:15 +0000 (10:50 +0000)]
am
632c915c: resolved conflicts for merge of
780d57b8 to klp-modular-dev
* commit '
632c915ce8675033bbb7d356239d16594b26dffb':
Fix destruction issues relating to AllocationAdapter.
Alan Viverette [Thu, 13 Mar 2014 10:01:39 +0000 (10:01 +0000)]
am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
9ebe031cdc916646e95ffcd92dde67e1655be7ba':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Thu, 13 Mar 2014 10:01:35 +0000 (10:01 +0000)]
am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
7b09a4e5df908783a95dbfef3bc9fabda339c3a1':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Thu, 13 Mar 2014 10:01:30 +0000 (10:01 +0000)]
am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
3c3377a2290764937548de5a49ca8ec28dc98153':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Thu, 13 Mar 2014 10:01:15 +0000 (10:01 +0000)]
am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
75958c298477a3d1e556c4fe36e516b9e828c311':
Fix a bug in submenu presenter priority handling
Jason Sams [Thu, 13 Mar 2014 09:28:22 +0000 (09:28 +0000)]
am
2ffcffd0: am
280db650: am
e14d5e90: am
5757bf89: Add hidden minor version ID for support lib workarounds.
* commit '
2ffcffd046e321b871a04480552cef6ee4735e62':
Add hidden minor version ID for support lib workarounds.
Jason Sams [Thu, 13 Mar 2014 09:28:19 +0000 (09:28 +0000)]
am
0641a5d4: am
7f8a4107: am
0165db38: (-s ours) am
ff7256e7: Fix destruction issues relating to AllocationAdapter.
* commit '
0641a5d4b1a3b0675c36f44adb05d0a5e20c3d56':
Fix destruction issues relating to AllocationAdapter.