OSDN Git Service
quddusc [Tue, 14 Jan 2014 20:41:54 +0000 (20:41 +0000)]
am
1746de33: am
bcc83d01: am
7c865524: am
64231d01: Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
* commit '
1746de33894b8f9a20e14338908f82df9a699d82':
docs: Fixed typo in IAB training doc. Bug:
10807741
quddusc [Tue, 14 Jan 2014 20:41:49 +0000 (20:41 +0000)]
am
76a6dfaf: am
e53c32a0: am
c61e6bc6: am
72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
* commit '
76a6dfafa1c18078450f1af46d28636c74f8964c':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251
quddusc [Tue, 14 Jan 2014 20:39:14 +0000 (20:39 +0000)]
am
bcc83d01: am
7c865524: am
64231d01: Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
* commit '
bcc83d01966dac7fb1d9ac45ae119ad44ee2c471':
docs: Fixed typo in IAB training doc. Bug:
10807741
quddusc [Tue, 14 Jan 2014 20:39:09 +0000 (20:39 +0000)]
am
e53c32a0: am
c61e6bc6: am
72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
* commit '
e53c32a0aa6ccb1bd177ff3fa3335c5b58ca5919':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251
quddusc [Tue, 14 Jan 2014 20:35:14 +0000 (12:35 -0800)]
am
7c865524: am
64231d01: Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
* commit '
7c865524048695f5dc471e6a357a142cf60495a7':
docs: Fixed typo in IAB training doc. Bug:
10807741
quddusc [Tue, 14 Jan 2014 20:35:08 +0000 (12:35 -0800)]
am
c61e6bc6: am
72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
* commit '
c61e6bc613db3d0d5ce7661bda3fe51ecc2f9726':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251
quddusc [Tue, 14 Jan 2014 20:31:55 +0000 (20:31 +0000)]
am
64231d01: Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
* commit '
64231d01dead59752ff230570cbe07f206d5c9ec':
docs: Fixed typo in IAB training doc. Bug:
10807741
quddusc [Tue, 14 Jan 2014 20:31:51 +0000 (20:31 +0000)]
am
72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
* commit '
72159ab085c48f4451ccf44a436e8b2122716fd4':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251
quddusc [Tue, 14 Jan 2014 20:29:13 +0000 (20:29 +0000)]
Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
quddusc [Tue, 14 Jan 2014 20:28:55 +0000 (20:28 +0000)]
Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
John Spurlock [Tue, 14 Jan 2014 20:00:42 +0000 (20:00 +0000)]
am
cce06eda: am
b3436359: am
e05190ea: am
85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
* commit '
cce06eda6bd6af957b261f66eb8ea3623fe09caf':
Docfixes: three typos and escape */*.
John Spurlock [Tue, 14 Jan 2014 19:57:02 +0000 (19:57 +0000)]
am
b3436359: am
e05190ea: am
85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
* commit '
b34363590953e4efd70168cdf03386d1e469a548':
Docfixes: three typos and escape */*.
John Spurlock [Tue, 14 Jan 2014 19:54:25 +0000 (11:54 -0800)]
am
e05190ea: am
85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
* commit '
e05190eae74be57dd517bb5afbccf901543329bf':
Docfixes: three typos and escape */*.
John Spurlock [Tue, 14 Jan 2014 19:50:38 +0000 (19:50 +0000)]
am
85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
* commit '
85f98508366e8422f71553d2a5e682eb804c7419':
Docfixes: three typos and escape */*.
John Spurlock [Tue, 14 Jan 2014 19:48:12 +0000 (19:48 +0000)]
Merge "Docfixes: three typos and escape */*." into klp-docs
Ricardo Cervera [Tue, 14 Jan 2014 17:47:04 +0000 (17:47 +0000)]
am
82ec0954: am
afe90d80: am
7dde7879: am
1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
* commit '
82ec09547423f7166e271226825ddd686cbab8cb':
docs: Fixed typo in AlertDialog code snippet.
Ricardo Cervera [Tue, 14 Jan 2014 17:43:25 +0000 (17:43 +0000)]
am
afe90d80: am
7dde7879: am
1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
* commit '
afe90d80563bf6e236f7be6d6312f269a1919cb8':
docs: Fixed typo in AlertDialog code snippet.
Ricardo Cervera [Tue, 14 Jan 2014 17:39:29 +0000 (09:39 -0800)]
am
7dde7879: am
1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
* commit '
7dde7879a4561a3ec9ffc48921a4d074e40aa74e':
docs: Fixed typo in AlertDialog code snippet.
Ricardo Cervera [Tue, 14 Jan 2014 17:36:07 +0000 (17:36 +0000)]
am
1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
* commit '
1a21c16b2bd74c022d6b83177027b78992dc42b5':
docs: Fixed typo in AlertDialog code snippet.
Ricardo Cervera [Tue, 14 Jan 2014 17:34:21 +0000 (17:34 +0000)]
Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
Marco Nelissen [Tue, 14 Jan 2014 16:21:43 +0000 (16:21 +0000)]
am
e2c046fe: am
13249411: am
a9045d24: am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
e2c046fe7c5eefb49f710bc417d54448c133cc93':
Add NULL check in updateProxyConfig
Marco Nelissen [Tue, 14 Jan 2014 16:18:02 +0000 (16:18 +0000)]
am
13249411: am
a9045d24: am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
13249411b1c7dd4a476eec6905998217636a9344':
Add NULL check in updateProxyConfig
Marco Nelissen [Tue, 14 Jan 2014 16:15:13 +0000 (08:15 -0800)]
am
a9045d24: am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
a9045d24a73faa6aa1e8ad204a1e14a53711a824':
Add NULL check in updateProxyConfig
Marco Nelissen [Tue, 14 Jan 2014 16:11:39 +0000 (08:11 -0800)]
am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
337aa376c09bb97a48afe075b4018f030445534f':
Add NULL check in updateProxyConfig
Marco Nelissen [Tue, 14 Jan 2014 16:08:18 +0000 (16:08 +0000)]
Merge "Add NULL check in updateProxyConfig"
Narayan Kamath [Tue, 14 Jan 2014 10:23:44 +0000 (10:23 +0000)]
am
d34950cf: am
80b0496a: am
2db26788: am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
d34950cfc66e258caba14c7ddc553028647898f1':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:20:33 +0000 (10:20 +0000)]
am
80b0496a: am
2db26788: am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
80b0496abeb03fe4c5086430218c7e4bcf3773db':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:16:39 +0000 (02:16 -0800)]
am
2db26788: am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
2db26788ab367f08cb5378d77e22e8939e7a28c2':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:13:45 +0000 (02:13 -0800)]
am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
e71afc2ea72e98c4631e79cad65f678090da87d3':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:09:50 +0000 (10:09 +0000)]
Merge "Revert "Hide AssetInputStream.getAssetInt.""
Narayan Kamath [Tue, 14 Jan 2014 10:08:45 +0000 (10:08 +0000)]
Revert "Hide AssetInputStream.getAssetInt."
This reverts commit
842d44ec1765e01f4a37af99cc1935b4d0399758.
Change-Id: I188e49d3651fd4941491c239b6a7c9f475995187
Narayan Kamath [Tue, 14 Jan 2014 09:57:37 +0000 (09:57 +0000)]
am
7f4dd912: am
271b28ac: am
80213160: am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
7f4dd91299051d89e04979ba26ee5c27472f49d4':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:54:33 +0000 (09:54 +0000)]
am
271b28ac: am
80213160: am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
271b28ac3121e8bcc46e15bd15b13bfbc1e1be89':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:51:14 +0000 (01:51 -0800)]
am
80213160: am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
8021316010fb4bd18a29751949eb2cda66199b6e':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:48:37 +0000 (01:48 -0800)]
am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
ac8ccc3c181a27103955b0f7bbf3dddabb0a6305':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:45:40 +0000 (09:45 +0000)]
Merge "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Fri, 10 Jan 2014 17:32:28 +0000 (17:32 +0000)]
Hide AssetInputStream.getAssetInt.
It returns a pointer to a private data structure, so there's
no sensible use for it. Also, the emergence of 64 bit processors
means that the return value isn't wide enough to represent
values in the native heap.
(cherry picked from commit
f8f09a15a409f373f22aa475bb0defd264088e4f)
Change-Id: I9c9b5bae6db8638e65dda60f924aa3dddd06813a
Dianne Hackborn [Tue, 14 Jan 2014 01:53:07 +0000 (01:53 +0000)]
am
305c61a1: am
3a8a8ddd: am
8c359bf4: am
c174288d: Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
* commit '
305c61a1c6816549b225719518df5b29a17f0f42':
Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
Dianne Hackborn [Tue, 14 Jan 2014 01:47:15 +0000 (01:47 +0000)]
am
3a8a8ddd: am
8c359bf4: am
c174288d: Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
* commit '
3a8a8ddd7cff03e39d4cb104ddb1d0401b6c7ede':
Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
Dianne Hackborn [Tue, 14 Jan 2014 01:45:16 +0000 (17:45 -0800)]
am
8c359bf4: am
c174288d: Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
* commit '
8c359bf473b4c31407613dbc1473ba49b0297898':
Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
Dianne Hackborn [Tue, 14 Jan 2014 01:42:01 +0000 (17:42 -0800)]
am
c174288d: Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
* commit '
c174288d345d4a80b326b12ff4c10a6c99570997':
Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
Dianne Hackborn [Mon, 9 Dec 2013 19:26:11 +0000 (11:26 -0800)]
Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
Got a little too aggressive about cleaning up service state; need to
avoid removing services from an app until we are in the second loop
doing the final cleanup, otherwise we can leave services around with
restarting their process.
Also fix crash:
W/BinderNative( 667): Uncaught exception from death notification
W/BinderNative( 667): java.lang.ArrayIndexOutOfBoundsException: length=0; index=0
W/BinderNative( 667): at android.util.ArraySet.valueAt(ArraySet.java:301)
W/BinderNative( 667): at com.android.server.am.ActiveServices.killServicesLocked(ActiveServices.java:2069)
W/BinderNative( 667): at com.android.server.am.ActivityManagerService.cleanUpApplicationRecordLocked(ActivityManagerService.java:12412)
W/BinderNative( 667): at com.android.server.am.ActivityManagerService.handleAppDiedLocked(ActivityManagerService.java:3596)
W/BinderNative( 667): at com.android.server.am.ActivityManagerService.appDiedLocked(ActivityManagerService.java:3744)
W/BinderNative( 667): at com.android.server.am.ActivityManagerService$AppDeathRecipient.binderDied(ActivityManagerService.java:1024)
W/BinderNative( 667): at android.os.BinderProxy.sendDeathNotice(Binder.java:493)
W/BinderNative( 667): at dalvik.system.NativeStart.run(Native Method)
Ricardo Cervera [Tue, 14 Jan 2014 00:44:19 +0000 (16:44 -0800)]
docs: Fixed typo in AlertDialog code snippet.
Bug-ID:
10797361
Review URL:
http://quixote.mtv.corp.google.com:8001/guide/topics/ui/dialogs.html#AlertDialog
Change-Id: If93e140d624c2a4360a27bfae630f19fce24d7ab
Ricardo Cervera [Tue, 14 Jan 2014 00:30:18 +0000 (00:30 +0000)]
am
03d65b4b: am
9865216e: am
18bf3b1d: am
5e15e1ab: Merge "docs: Fixed typo." into klp-docs
* commit '
03d65b4b8a0893d57c5bb00f7f8d02a7869ff12c':
docs: Fixed typo.
Ricardo Cervera [Tue, 14 Jan 2014 00:30:11 +0000 (00:30 +0000)]
Ricardo Cervera [Tue, 14 Jan 2014 00:26:41 +0000 (00:26 +0000)]
am
9865216e: am
18bf3b1d: am
5e15e1ab: Merge "docs: Fixed typo." into klp-docs
* commit '
9865216eb1c747b03cb60245772b196fc039a1b6':
docs: Fixed typo.
Ricardo Cervera [Tue, 14 Jan 2014 00:26:36 +0000 (00:26 +0000)]
am
f4494e6c: am
faca5e3c: am
ac5ad7b9: docs: Fixed typos.
* commit '
f4494e6c8f7fc610795337a72d774e0f6cdc94ac':
docs: Fixed typos.
Ricardo Cervera [Tue, 14 Jan 2014 00:23:24 +0000 (16:23 -0800)]
am
18bf3b1d: am
5e15e1ab: Merge "docs: Fixed typo." into klp-docs
* commit '
18bf3b1df67f219d70e6cba828216a47d92e3dc5':
docs: Fixed typo.
Ricardo Cervera [Tue, 14 Jan 2014 00:23:19 +0000 (16:23 -0800)]
am
faca5e3c: am
ac5ad7b9: docs: Fixed typos.
* commit '
faca5e3c917a6197b380eb5d2b51893b5d689946':
docs: Fixed typos.
Ricardo Cervera [Tue, 14 Jan 2014 00:19:55 +0000 (00:19 +0000)]
am
5e15e1ab: Merge "docs: Fixed typo." into klp-docs
* commit '
5e15e1abe8a14f95ab40cf8181ac2a4f8b5d76e2':
docs: Fixed typo.
Ricardo Cervera [Tue, 14 Jan 2014 00:19:51 +0000 (00:19 +0000)]
am
ac5ad7b9: docs: Fixed typos.
* commit '
ac5ad7b9e488a967ffee56fd1b168c010c1d62e8':
docs: Fixed typos.
Ricardo Cervera [Tue, 14 Jan 2014 00:18:23 +0000 (00:18 +0000)]
Merge "docs: Fixed typo." into klp-docs
Ricardo Cervera [Mon, 13 Jan 2014 21:48:45 +0000 (13:48 -0800)]
docs: Fixed typos.
bug:
10732654
Change-Id: I5a580cf40e2670485f9c57e2376efd20bcf7b60d
Review URL: http://quixote.mtv.corp.google.com:8002/training/articles/security-tips.html
Craig Mautner [Tue, 14 Jan 2014 00:00:00 +0000 (00:00 +0000)]
Merge "Use new DisplayManager flag to show own content only." into klp-modular-dev
Ricardo Cervera [Mon, 13 Jan 2014 21:27:47 +0000 (13:27 -0800)]
docs: Fixed typo.
bug:
10797855
Change-Id: I2fdfa02046827a51eb7263e1892a04acfd4f0453
Review fix URL:
http://quixote.mtv.corp.google.com:8001/distribute/index.html
Jim Miller [Mon, 13 Jan 2014 22:25:03 +0000 (22:25 +0000)]
Merge "Fix broken homekey on devices without keyguard" into klp-modular-dev
David Christie [Mon, 13 Jan 2014 21:10:05 +0000 (21:10 +0000)]
am
cf77c059: am
c809bd8b: am
d8dfa528: am
301b1fac: am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
cf77c05988dee8410d9235b9818dbcdf01c48f4f':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 21:06:24 +0000 (21:06 +0000)]
am
c809bd8b: am
d8dfa528: am
301b1fac: am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
c809bd8b39c2ab8874d6eb2e7189ca9e72f4c9ed':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 21:03:33 +0000 (13:03 -0800)]
am
d8dfa528: am
301b1fac: am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
d8dfa528b86e734318159b6fa75814184fb02c9d':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:59:20 +0000 (12:59 -0800)]
am
301b1fac: am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
301b1facb23d148efebd7a2aa5c174cd7c04cc6f':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:56:27 +0000 (12:56 -0800)]
am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
26c6c15f54231c154bb2f7febb053d034cbe40c5':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
Craig Mautner [Mon, 13 Jan 2014 20:55:33 +0000 (12:55 -0800)]
Use new DisplayManager flag to show own content only.
Change-Id: I8b2666e5849e57b5eb2ed73ed3d5e39da2dbd55d
David Christie [Mon, 13 Jan 2014 20:53:27 +0000 (12:53 -0800)]
am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
b3c96c4c57cb97924f828ea917b1c4d63b2c9d00':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:50:18 +0000 (12:50 -0800)]
am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
1d151607fbee65fc9fc2bb1cb38a850c1f68bede':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:46:35 +0000 (12:46 -0800)]
am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
4013c4b18ccc66b510f4cdb222d4c04597975843':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:43:47 +0000 (12:43 -0800)]
am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
42d7a0bff5da6aeb8323ae0c797e9c4e116b637b':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:41:48 +0000 (12:41 -0800)]
am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
a7d13fabd6184e411215e9a841cf16097f1a5127':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:40:04 +0000 (12:40 -0800)]
am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
45aaa377c5d090003c6cf5fb54fff856a0807c4f':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:36:49 +0000 (12:36 -0800)]
am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
a1b89310d58df14570f7f6f5abb677c976c63a7a':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:33:39 +0000 (12:33 -0800)]
am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
a87bdc1f8ff308f90ec7a3234c4848c79d4c3988':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 19:10:08 +0000 (19:10 +0000)]
am
555b8ebf: am
e29ff50a: am
fe7bfdd3: am
af2f2f76: am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
555b8ebfd6e4ee1f60752459061f6dae2fd45981':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 19:05:49 +0000 (19:05 +0000)]
am
e29ff50a: am
fe7bfdd3: am
af2f2f76: am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
e29ff50aae302ef05b0592e4bab6b3090a59254a':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 19:02:15 +0000 (11:02 -0800)]
am
fe7bfdd3: am
af2f2f76: am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
fe7bfdd384f199668ba9b1b751194e06cbb50b3b':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 19:00:37 +0000 (19:00 +0000)]
am
21a801d0: am
0d30e07d: am
3d5ea26f: am
4503409a: Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
* commit '
21a801d0885d65f128b84a593140b07fd0d4e980':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 19:00:02 +0000 (11:00 -0800)]
am
af2f2f76: am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
af2f2f767a1673f10a2b44f913832cacefda341b':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:57:19 +0000 (18:57 +0000)]
am
0d30e07d: am
3d5ea26f: am
4503409a: Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
* commit '
0d30e07d23e9a2bcea4c1b3e61e12e68f5111fe2':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:56:41 +0000 (10:56 -0800)]
am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
9ecadd7cedc492faef163a314713caddbd5da39a':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:53:31 +0000 (10:53 -0800)]
am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:52:54 +0000 (10:52 -0800)]
am
3d5ea26f: am
4503409a: Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
* commit '
3d5ea26fbb92b1b780cd9763c0731288f48341a3':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:50:03 +0000 (10:50 -0800)]
am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:49:40 +0000 (10:49 -0800)]
am
4503409a: Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
* commit '
4503409a477f3fca2eb60e4105d804069d7b0cad':
Clear cached locations when location providers disabled Bug:
12118307
Jeff Sharkey [Mon, 13 Jan 2014 18:47:41 +0000 (18:47 +0000)]
am
6fba240b: am
6d3700b3: am
47235e8b: am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
6fba240b72e9ae2bc66c98b058e78aecd568ae3f':
MountService listeners can not be unregistered
Daniel Cashman [Mon, 13 Jan 2014 18:44:45 +0000 (18:44 +0000)]
Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
Jeff Sharkey [Mon, 13 Jan 2014 18:44:43 +0000 (18:44 +0000)]
am
6d3700b3: am
47235e8b: am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
6d3700b394c7137ef95580d35223a402a3dd0e7c':
MountService listeners can not be unregistered
Daniel Cashman [Mon, 13 Jan 2014 18:44:37 +0000 (18:44 +0000)]
Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
Jeff Sharkey [Mon, 13 Jan 2014 18:42:07 +0000 (10:42 -0800)]
am
47235e8b: am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
47235e8b5ce6c622a1182933404cf5a17fcd35dc':
MountService listeners can not be unregistered
Jeff Sharkey [Mon, 13 Jan 2014 18:37:51 +0000 (10:37 -0800)]
am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
90cadb35156829ff1d6b7066409596da38fc70e1':
MountService listeners can not be unregistered
Jeff Sharkey [Mon, 13 Jan 2014 18:35:31 +0000 (18:35 +0000)]
Merge "MountService listeners can not be unregistered"
Narayan Kamath [Mon, 13 Jan 2014 13:07:47 +0000 (13:07 +0000)]
am
f588d2df: am
d0ec6d8c: am
bc2a449a: am
cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit '
f588d2dff2ca6000fe02c5ac6e85f97133477767':
Fix preference puts with "null" values.
Narayan Kamath [Mon, 13 Jan 2014 13:04:28 +0000 (13:04 +0000)]
am
d0ec6d8c: am
bc2a449a: am
cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit '
d0ec6d8c505142a51a6c1bfb3637d4a49aa05f32':
Fix preference puts with "null" values.
Narayan Kamath [Mon, 13 Jan 2014 13:01:44 +0000 (05:01 -0800)]
am
bc2a449a: am
cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit '
bc2a449a615b30efb81a1a0082a1bb0db515d0f5':
Fix preference puts with "null" values.
Narayan Kamath [Mon, 13 Jan 2014 12:32:19 +0000 (04:32 -0800)]
am
cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit '
cb4d3ec1ea446fc9ce51514cbf5b16da0ec0fa0f':
Fix preference puts with "null" values.
Narayan Kamath [Mon, 13 Jan 2014 12:29:41 +0000 (12:29 +0000)]
Merge "Fix preference puts with "null" values."
Craig Mautner [Mon, 13 Jan 2014 05:33:51 +0000 (05:33 +0000)]
Merge "Add display synchronously." into klp-modular-dev
Craig Mautner [Mon, 13 Jan 2014 05:19:06 +0000 (21:19 -0800)]
Add display synchronously.
Adding the virtual display to window manager through a handler message
causes timing issues. Add the display directly to fix it.
Change-Id: I3ad6b16ce6dff2a48abd120a8e873e11a028e2c3
Jim Miller [Wed, 8 Jan 2014 22:57:54 +0000 (14:57 -0800)]
Fix broken homekey on devices without keyguard
Fixes bug
12447288
Change-Id: I580dbeac03b56c01d33844f094eaac20d7aba119
Jason Sams [Sat, 11 Jan 2014 00:57:22 +0000 (00:57 +0000)]
am
1ae17633: am
411350dd: am
739ae9b3: am
868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit '
1ae176335548f0273e040b6ac0c34e2274789b88':
Fix a JNI local reference leak in MediaDrm
Jason Sams [Sat, 11 Jan 2014 00:54:18 +0000 (00:54 +0000)]
am
411350dd: am
739ae9b3: am
868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit '
411350dd234dcf246adf884b66751ac1def64cc0':
Fix a JNI local reference leak in MediaDrm
Jason Sams [Sat, 11 Jan 2014 00:50:54 +0000 (16:50 -0800)]
am
739ae9b3: am
868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit '
739ae9b3b77458b4c77f799cba56dc68d65ab424':
Fix a JNI local reference leak in MediaDrm
Jason Sams [Sat, 11 Jan 2014 00:48:12 +0000 (16:48 -0800)]
am
868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit '
868173a53f0d1059408b049f30af3402d5b0de64':
Fix a JNI local reference leak in MediaDrm
OSDN Git Service
