OSDN Git Service
Leon Scroggins III [Mon, 15 Jun 2015 15:00:27 +0000 (15:00 +0000)]
am
16470b4b: am
e7641e29: am
c3809332: am
8c9ae41b: (-s ours) am
303581be: resolved conflicts for merge of
3ff978a5 to cw-d-mr1-dev
* commit '
16470b4b407f3c522e61cf4bf7d580acc2f3a9ec':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Jason Monk [Mon, 15 Jun 2015 15:00:19 +0000 (15:00 +0000)]
am
794e06df: am
a3de0d98: am
7d79bea4: Merge "Fix invisible rotation tile" into mnc-dev
* commit '
794e06dfa9da7596b8f22a3c25b606fcdb1076f4':
Fix invisible rotation tile
Leon Scroggins III [Mon, 15 Jun 2015 14:48:20 +0000 (14:48 +0000)]
am
e7641e29: am
c3809332: am
8c9ae41b: (-s ours) am
303581be: resolved conflicts for merge of
3ff978a5 to cw-d-mr1-dev
* commit '
e7641e295d3f366b5269cbeeb1ca97a4c99b3791':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Jason Monk [Mon, 15 Jun 2015 14:48:15 +0000 (14:48 +0000)]
am
a3de0d98: am
7d79bea4: Merge "Fix invisible rotation tile" into mnc-dev
* commit '
a3de0d9877b9951d964232cd3232f441c1b00379':
Fix invisible rotation tile
Jason Monk [Mon, 15 Jun 2015 14:48:06 +0000 (14:48 +0000)]
am
fa0302bf: am
9fed13f8: am
5d8c276b: Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev
* commit '
fa0302bf131aa9a254616a32d2a2d3e1a85a8dc2':
Make references to ssid use a verbatim TtsSpan
Jason Monk [Mon, 15 Jun 2015 14:39:07 +0000 (14:39 +0000)]
am
9fed13f8: am
5d8c276b: Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev
* commit '
9fed13f8c3be41d5039757fe44631b31780d89b6':
Make references to ssid use a verbatim TtsSpan
Leon Scroggins III [Mon, 15 Jun 2015 14:37:08 +0000 (14:37 +0000)]
am
c3809332: am
8c9ae41b: (-s ours) am
303581be: resolved conflicts for merge of
3ff978a5 to cw-d-mr1-dev
* commit '
c3809332fca20139543710abc78b185fb1abc9f2':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Jason Monk [Mon, 15 Jun 2015 14:37:04 +0000 (14:37 +0000)]
am
7d79bea4: Merge "Fix invisible rotation tile" into mnc-dev
* commit '
7d79bea4a92760559f61cfbe412cd8470b84c9fc':
Fix invisible rotation tile
Leon Scroggins III [Mon, 15 Jun 2015 14:30:20 +0000 (14:30 +0000)]
am
8c9ae41b: (-s ours) am
303581be: resolved conflicts for merge of
3ff978a5 to cw-d-mr1-dev
* commit '
8c9ae41bc7188cfe929d0b4f31c18faf9f9a03f7':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Geoff Mendal [Mon, 15 Jun 2015 14:29:53 +0000 (14:29 +0000)]
am
b736c65a: (-s ours) am
ea1807aa: (-s ours) am
991f0f65: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
b736c65ab194ed9b381fc37dfc00c9b7635e8c2c':
Import translations. DO NOT MERGE
Jason Monk [Mon, 15 Jun 2015 14:26:36 +0000 (14:26 +0000)]
Merge "Fix invisible rotation tile" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:23:58 +0000 (14:23 +0000)]
am
5d8c276b: Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev
* commit '
5d8c276bb91788441ec9a98717017eb01f1b348f':
Make references to ssid use a verbatim TtsSpan
Jason Monk [Mon, 15 Jun 2015 14:19:26 +0000 (10:19 -0400)]
Fix invisible rotation tile
Make sure we set the state at least once.
Bug:
21837219
Change-Id: Iabd0524f0c09fd3f7b895007204ddf49af19ea98
Geoff Mendal [Mon, 15 Jun 2015 14:17:40 +0000 (14:17 +0000)]
am
ea1807aa: (-s ours) am
991f0f65: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ea1807aa9d6829e4b8c07b82a349d1f15d37a503':
Import translations. DO NOT MERGE
Jason Monk [Mon, 15 Jun 2015 14:14:50 +0000 (14:14 +0000)]
Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 14:11:30 +0000 (14:11 +0000)]
am
f5c84d5c: (-s ours) am
f2cd1681: (-s ours) am
8cacde13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f5c84d5ca33c8f24ab5ae870229b0d4bf7ff4340':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 14:11:25 +0000 (14:11 +0000)]
am
13eae792: (-s ours) am
26df3646: (-s ours) am
1ed87e5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
13eae7929f5defcbbb7342b6b09842e5c4f88bc2':
Import translations. DO NOT MERGE
Paul Jensen [Mon, 15 Jun 2015 14:11:20 +0000 (14:11 +0000)]
am
b379fdd0: am
49ab026a: am
8a6025fd: Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev
* commit '
b379fdd0e9fa560e0abfe771acf920bb6aca60ad':
Remove most sleep() calls from ConnectivityServiceTest
Geoff Mendal [Mon, 15 Jun 2015 14:09:04 +0000 (14:09 +0000)]
am
991f0f65: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
991f0f6549fd25a658f2519b4ee2169c6c5195eb':
Import translations. DO NOT MERGE
Jason Monk [Mon, 15 Jun 2015 14:07:55 +0000 (10:07 -0400)]
Make references to ssid use a verbatim TtsSpan
Bug:
20059794
Change-Id: Id92ef11e78547e168f55515dea2fc28519871d6f
Geoff Mendal [Mon, 15 Jun 2015 13:59:12 +0000 (13:59 +0000)]
am
f2cd1681: (-s ours) am
8cacde13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f2cd168186d6e96a345b7d6cd54e312f5536a1e0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 13:59:08 +0000 (13:59 +0000)]
am
26df3646: (-s ours) am
1ed87e5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
26df364618da36007186df8eb4c7a85e47f8e18a':
Import translations. DO NOT MERGE
Paul Jensen [Mon, 15 Jun 2015 13:59:04 +0000 (13:59 +0000)]
am
49ab026a: am
8a6025fd: Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev
* commit '
49ab026a5298668681665212e0ea21f514e0642e':
Remove most sleep() calls from ConnectivityServiceTest
Geoff Mendal [Mon, 15 Jun 2015 13:54:36 +0000 (13:54 +0000)]
am
8cacde13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
8cacde138398bb63a131452fab84e3677b87adc3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 13:54:32 +0000 (13:54 +0000)]
am
1ed87e5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
1ed87e5d30b5ccfd1d7448f22389143928b8c118':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 13:53:09 +0000 (13:53 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 13:51:34 +0000 (08:51 -0500)]
Import translations. DO NOT MERGE
Change-Id: I2b7fd1100aca78ce28f084bcf94637ba1975b21e
Auto-generated-cl: translation import
Paul Jensen [Mon, 15 Jun 2015 13:49:38 +0000 (13:49 +0000)]
am
8a6025fd: Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev
* commit '
8a6025fdaf84ed6a9dbf1b21f48a931c90d4036e':
Remove most sleep() calls from ConnectivityServiceTest
Geoff Mendal [Mon, 15 Jun 2015 13:45:41 +0000 (13:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 13:44:44 +0000 (13:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 13:43:30 +0000 (08:43 -0500)]
Import translations. DO NOT MERGE
Change-Id: Id021d13867abfcb10e4fb1a9754ae21052f66ffb
Auto-generated-cl: translation import
Geoff Mendal [Mon, 15 Jun 2015 13:39:05 +0000 (08:39 -0500)]
Import translations. DO NOT MERGE
Change-Id: I7bb1d35595971e4d2ff83ba40c01524ed243d26d
Auto-generated-cl: translation import
Paul Jensen [Mon, 15 Jun 2015 13:35:46 +0000 (13:35 +0000)]
Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev
Chris Wren [Mon, 15 Jun 2015 13:00:51 +0000 (13:00 +0000)]
am
de382ea5: am
09cd21be: am
b3c85643: Merge "remove setLatestEventInfo from USB" into mnc-dev
* commit '
de382ea5894d2f1f8d05a3bbf2a3b5cff0bc8a9c':
remove setLatestEventInfo from USB
Chris Wren [Mon, 15 Jun 2015 12:48:23 +0000 (12:48 +0000)]
am
09cd21be: am
b3c85643: Merge "remove setLatestEventInfo from USB" into mnc-dev
* commit '
09cd21be4503347057acc6d643e6a59ae2bb5623':
remove setLatestEventInfo from USB
Geoff Mendal [Mon, 15 Jun 2015 12:45:30 +0000 (12:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 15 Jun 2015 12:43:00 +0000 (07:43 -0500)]
Import translations. DO NOT MERGE
Change-Id: I1b95c8dafe37d6c4ffdd668b88f391a9ad90b486
Auto-generated-cl: translation import
Chris Wren [Mon, 15 Jun 2015 12:35:48 +0000 (12:35 +0000)]
am
b3c85643: Merge "remove setLatestEventInfo from USB" into mnc-dev
* commit '
b3c8564314a4ce05b722e33409f2c15bcdac6666':
remove setLatestEventInfo from USB
Geoff Mendal [Mon, 15 Jun 2015 12:30:47 +0000 (12:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 15 Jun 2015 12:28:03 +0000 (07:28 -0500)]
Import translations. DO NOT MERGE
Change-Id: I97060ccb99ccfa2cc1deb381b00500e4ff9661fd
Auto-generated-cl: translation import
Chris Wren [Mon, 15 Jun 2015 12:23:23 +0000 (12:23 +0000)]
Merge "remove setLatestEventInfo from USB" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 12:14:23 +0000 (07:14 -0500)]
Import translations. DO NOT MERGE
Change-Id: I42135483910df8a810bd373ade898cb0a9962a8c
Auto-generated-cl: translation import
Jeff Sharkey [Mon, 15 Jun 2015 04:44:50 +0000 (04:44 +0000)]
am
a8e68812: am
315bca80: am
0463cad7: Maybe make strings happy?
* commit '
a8e68812e6d64899fb3c45aef1248bad0d23a1dd':
Maybe make strings happy?
Jeff Sharkey [Mon, 15 Jun 2015 04:44:45 +0000 (04:44 +0000)]
am
330178fa: am
e60ba0c7: am
52fc3c0f: Start using new storage strings.
* commit '
330178fa60aeceac74d942bdf1470794fe63eede':
Start using new storage strings.
Jeff Sharkey [Mon, 15 Jun 2015 04:33:02 +0000 (04:33 +0000)]
am
315bca80: am
0463cad7: Maybe make strings happy?
* commit '
315bca80118d92eb79710c97251185879c5b1dfd':
Maybe make strings happy?
Jeff Sharkey [Mon, 15 Jun 2015 04:32:58 +0000 (04:32 +0000)]
am
e60ba0c7: am
52fc3c0f: Start using new storage strings.
* commit '
e60ba0c7fe970436ad70c0fe99b369b482b30fe1':
Start using new storage strings.
Jeff Sharkey [Mon, 15 Jun 2015 04:21:03 +0000 (04:21 +0000)]
am
0463cad7: Maybe make strings happy?
* commit '
0463cad783e78381f390855d1cc9d7d8d803b634':
Maybe make strings happy?
Jeff Sharkey [Mon, 15 Jun 2015 04:20:59 +0000 (04:20 +0000)]
am
52fc3c0f: Start using new storage strings.
* commit '
52fc3c0f73a9081609c3636dd1b393a0653a9d00':
Start using new storage strings.
Jeff Sharkey [Mon, 15 Jun 2015 04:18:10 +0000 (21:18 -0700)]
Maybe make strings happy?
Bug:
21805255
Change-Id: I2e299a83b449aadc8e9a523fc4bbbf6f843f121d
Jeff Sharkey [Mon, 15 Jun 2015 03:58:54 +0000 (20:58 -0700)]
Start using new storage strings.
We have language for "unsupported" devices, and we're letting the
user snooze missing private volumes.
Bug:
21666225
Change-Id: I0bc17e6b854946036f02df5b4953b4344fa85a1f
Svetoslav [Sun, 14 Jun 2015 20:34:52 +0000 (20:34 +0000)]
am
13fb3353: am
281c8389: am
6d977832: Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev
* commit '
13fb33535f93c8cd49650b398f5728938f90933b':
Remove bookmarks provider and associated permissions - framework
Svetoslav [Sun, 14 Jun 2015 20:23:44 +0000 (20:23 +0000)]
am
281c8389: am
6d977832: Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev
* commit '
281c8389bcc50554496d525124338b1f7264525f':
Remove bookmarks provider and associated permissions - framework
Svetoslav [Sun, 14 Jun 2015 20:12:03 +0000 (20:12 +0000)]
am
6d977832: Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev
* commit '
6d9778328a3c3c9da525870fff606af8ac5e9529':
Remove bookmarks provider and associated permissions - framework
Svetoslav [Sun, 14 Jun 2015 20:00:59 +0000 (20:00 +0000)]
Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev
Svet Ganov [Sun, 14 Jun 2015 03:54:35 +0000 (03:54 +0000)]
am
ab47ce05: am
d0fe86b5: am
a5c852e0: Merge "Clear runtime permissions on package data reset." into mnc-dev
* commit '
ab47ce059f806f282c565059a745f662c943d8e3':
Clear runtime permissions on package data reset.
Svet Ganov [Sun, 14 Jun 2015 03:43:00 +0000 (03:43 +0000)]
am
d0fe86b5: am
a5c852e0: Merge "Clear runtime permissions on package data reset." into mnc-dev
* commit '
d0fe86b590af4167369a7c1857d758a6378679ca':
Clear runtime permissions on package data reset.
Svet Ganov [Sun, 14 Jun 2015 03:31:45 +0000 (03:31 +0000)]
am
a5c852e0: Merge "Clear runtime permissions on package data reset." into mnc-dev
* commit '
a5c852e03abb9372a6928271a930d7d79e4ec45e':
Clear runtime permissions on package data reset.
Svet Ganov [Sun, 14 Jun 2015 03:22:06 +0000 (03:22 +0000)]
Merge "Clear runtime permissions on package data reset." into mnc-dev
Svet Ganov [Sun, 14 Jun 2015 03:10:36 +0000 (20:10 -0700)]
Clear runtime permissions on package data reset.
bug:
21817488
Change-Id: I7c51fee5206e3bcb79951f237a71862f0752a709
Svet Ganov [Sun, 14 Jun 2015 01:47:33 +0000 (01:47 +0000)]
am
d85e7d06: am
174b86de: am
715cf2ac: Make AppOpsManager#permissionToOp API public
* commit '
d85e7d06e0cb6b0cbafa53536ec9a817c1fa6068':
Make AppOpsManager#permissionToOp API public
Svet Ganov [Sun, 14 Jun 2015 01:36:18 +0000 (01:36 +0000)]
am
174b86de: am
715cf2ac: Make AppOpsManager#permissionToOp API public
* commit '
174b86dede42cf63c99d16f32f312069e9c74634':
Make AppOpsManager#permissionToOp API public
Svet Ganov [Sun, 14 Jun 2015 01:23:53 +0000 (01:23 +0000)]
am
715cf2ac: Make AppOpsManager#permissionToOp API public
* commit '
715cf2ac0bcd44720096cc91709b690b4828f0df':
Make AppOpsManager#permissionToOp API public
Svet Ganov [Sun, 14 Jun 2015 00:31:29 +0000 (17:31 -0700)]
Make AppOpsManager#permissionToOp API public
We need this API to implement permission checker API
in the support lib that takes into account both app
ops and permissions.
bug:
21277214
Change-Id: I684fc002bb71ec5e1cd2994098faa0d2036297ac
Nick Kralevich [Sat, 13 Jun 2015 03:43:28 +0000 (03:43 +0000)]
am
428e0ec1: am
ace5cd6f: am
31b9c172: Merge "UsbDeviceManager: Modify default function handling" into mnc-dev
* commit '
428e0ec16599c739c415935420b0a829dfe562bc':
UsbDeviceManager: Modify default function handling
Nick Kralevich [Sat, 13 Jun 2015 03:31:25 +0000 (03:31 +0000)]
am
ace5cd6f: am
31b9c172: Merge "UsbDeviceManager: Modify default function handling" into mnc-dev
* commit '
ace5cd6f5a0af6268739f2dc9eb5f788fb3ea011':
UsbDeviceManager: Modify default function handling
Nick Kralevich [Sat, 13 Jun 2015 03:19:41 +0000 (03:19 +0000)]
am
31b9c172: Merge "UsbDeviceManager: Modify default function handling" into mnc-dev
* commit '
31b9c1721f817600238476cb8eb495e6ed629960':
UsbDeviceManager: Modify default function handling
Nick Kralevich [Sat, 13 Jun 2015 03:12:46 +0000 (03:12 +0000)]
Merge "UsbDeviceManager: Modify default function handling" into mnc-dev
Dmitriy Ivanov [Sat, 13 Jun 2015 02:42:31 +0000 (02:42 +0000)]
am
fd8fd2a6: am
e9228171: am
8da462de: Merge "Add path to native libraries inside apk"
* commit '
fd8fd2a6155d9ff2be36e8c379d36d070bc33997':
Add path to native libraries inside apk
Chris Tate [Sat, 13 Jun 2015 02:42:25 +0000 (02:42 +0000)]
am
52047ab1: am
386a5a29: am
396b83b0: Merge "Fix overflow/underflow problem in comparison"
* commit '
52047ab160629275f77d9dba6d69eb223986bdda':
Fix overflow/underflow problem in comparison
Dmitriy Ivanov [Sat, 13 Jun 2015 02:25:59 +0000 (02:25 +0000)]
am
e9228171: am
8da462de: Merge "Add path to native libraries inside apk"
* commit '
e92281716aa217c84b85c2f02b4e6175cde8c250':
Add path to native libraries inside apk
Chris Tate [Sat, 13 Jun 2015 02:25:25 +0000 (02:25 +0000)]
am
386a5a29: am
396b83b0: Merge "Fix overflow/underflow problem in comparison"
* commit '
386a5a2940acd346f1d9e81c87dfa87e7d146065':
Fix overflow/underflow problem in comparison
Jim Miller [Sat, 13 Jun 2015 01:40:17 +0000 (01:40 +0000)]
am
c425e570: am
b3957fbd: am
1035833f: Merge "Improve LockPatternView accessibility" into mnc-dev
* commit '
c425e570141a6466ff81f36eb86cb91188c41c77':
Improve LockPatternView accessibility
Svetoslav [Sat, 13 Jun 2015 01:40:11 +0000 (01:40 +0000)]
am
659ef3c1: (-s ours) am
a6d4213c: am
911f0a1e: am
16c31a77: (-s ours) am
49717697: am
34c7bd7c: am
74e04083: am
07264d93: am
18fb1c92: (-s ours) am
bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
* commit '
659ef3c10f69c6afb2a342789fff1e7135b9ab01':
DO NOT MERGE Don't take flags when creating app widget config activity.
Jim Miller [Sat, 13 Jun 2015 01:29:01 +0000 (01:29 +0000)]
am
b3957fbd: am
1035833f: Merge "Improve LockPatternView accessibility" into mnc-dev
* commit '
b3957fbd9b7f12881a781529fb957aebba752feb':
Improve LockPatternView accessibility
Svetoslav [Sat, 13 Jun 2015 01:28:56 +0000 (01:28 +0000)]
am
a6d4213c: am
911f0a1e: am
16c31a77: (-s ours) am
49717697: am
34c7bd7c: am
74e04083: am
07264d93: am
18fb1c92: (-s ours) am
bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
* commit '
a6d4213c764a05cacddec689ffb2a02141abb9ae':
DO NOT MERGE Don't take flags when creating app widget config activity.
Jim Miller [Sat, 13 Jun 2015 01:17:48 +0000 (01:17 +0000)]
am
1035833f: Merge "Improve LockPatternView accessibility" into mnc-dev
* commit '
1035833fc6bcbd970807720926d8b93957775dbe':
Improve LockPatternView accessibility
Svetoslav [Sat, 13 Jun 2015 01:17:44 +0000 (01:17 +0000)]
am
911f0a1e: am
16c31a77: (-s ours) am
49717697: am
34c7bd7c: am
74e04083: am
07264d93: am
18fb1c92: (-s ours) am
bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
* commit '
911f0a1e36b5f0a50c2dc1783c521070da2ba06b':
DO NOT MERGE Don't take flags when creating app widget config activity.
Jim Miller [Sat, 13 Jun 2015 01:10:20 +0000 (01:10 +0000)]
Merge "Improve LockPatternView accessibility" into mnc-dev
Makoto Onuki [Sat, 13 Jun 2015 01:06:22 +0000 (01:06 +0000)]
am
ed960080: am
5a9ef04f: am
bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev
* commit '
ed9600801733b3481a3ede9af94d2129620a348e':
Fix ArrayIndexOutOfBoundsException in Transport.query
Jorim Jaggi [Sat, 13 Jun 2015 01:06:16 +0000 (01:06 +0000)]
am
ac31a0c6: am
ae455573: am
a8990422: Merge "Fix dark mode for custom views" into mnc-dev
* commit '
ac31a0c60cc82eb98d3dd3f0ed36728409e13858':
Fix dark mode for custom views
Svetoslav [Sat, 13 Jun 2015 01:04:02 +0000 (01:04 +0000)]
am
16c31a77: (-s ours) am
49717697: am
34c7bd7c: am
74e04083: am
07264d93: am
18fb1c92: (-s ours) am
bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
* commit '
16c31a77f75a30189a221043ad3ce73ca1610559':
DO NOT MERGE Don't take flags when creating app widget config activity.
Dmitriy Ivanov [Sat, 13 Jun 2015 00:57:08 +0000 (00:57 +0000)]
am
8da462de: Merge "Add path to native libraries inside apk"
* commit '
8da462dea50dda16ea83b8cad83412a76f60f915':
Add path to native libraries inside apk
Makoto Onuki [Sat, 13 Jun 2015 00:53:55 +0000 (00:53 +0000)]
am
5a9ef04f: am
bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev
* commit '
5a9ef04f032933ddc45611ff598f74273d9bccda':
Fix ArrayIndexOutOfBoundsException in Transport.query
Jorim Jaggi [Sat, 13 Jun 2015 00:53:51 +0000 (00:53 +0000)]
am
ae455573: am
a8990422: Merge "Fix dark mode for custom views" into mnc-dev
* commit '
ae45557394c10d8e16ebd38ecfa1b0576375643d':
Fix dark mode for custom views
Dmitriy Ivanov [Sat, 13 Jun 2015 00:43:56 +0000 (00:43 +0000)]
Merge "Add path to native libraries inside apk"
Makoto Onuki [Sat, 13 Jun 2015 00:35:26 +0000 (00:35 +0000)]
am
bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev
* commit '
bd25b5f6021295932a8ce2a6fa534dc37dacf249':
Fix ArrayIndexOutOfBoundsException in Transport.query
Jorim Jaggi [Sat, 13 Jun 2015 00:35:22 +0000 (00:35 +0000)]
am
a8990422: Merge "Fix dark mode for custom views" into mnc-dev
* commit '
a89904223770a43d4c2e5ecd26400ed8f1db68df':
Fix dark mode for custom views
Makoto Onuki [Sat, 13 Jun 2015 00:29:45 +0000 (00:29 +0000)]
am
92177ad7: am
b3be7c26: am
80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev
* commit '
92177ad765b86f77e86a29e9d013883af9fec134':
Add StorageEventListener.onDiskDestroyed()
Makoto Onuki [Sat, 13 Jun 2015 00:28:17 +0000 (00:28 +0000)]
Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev
Jorim Jaggi [Sat, 13 Jun 2015 00:27:05 +0000 (00:27 +0000)]
Merge "Fix dark mode for custom views" into mnc-dev
Nick Kralevich [Sat, 13 Jun 2015 00:19:12 +0000 (17:19 -0700)]
UsbDeviceManager: Modify default function handling
When adb is enabled, there's no need to also enable MTP mode.
ADB mode enabled is sufficient to get connect messages from
the kernel driver.
This change modifies getDefaultFunctions() to return adb mode
if adb is enabled, but mtp when it's not enabled. Also stop
using "none" mode as the default. "none" should only be used
when toggling the driver.
Bug:
21429947
Change-Id: I767491417c6c69a120fcf4f3d6ec0c73311a1a60
Makoto Onuki [Sat, 13 Jun 2015 00:14:57 +0000 (17:14 -0700)]
Fix ArrayIndexOutOfBoundsException in Transport.query
The bug was that it used getCount() instead of getColumnCount().
Bug
21727804
Change-Id: I3ed6ed3be60c2cb25316340f588f993bac70f52b
Makoto Onuki [Sat, 13 Jun 2015 00:16:16 +0000 (00:16 +0000)]
am
b3be7c26: am
80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev
* commit '
b3be7c26977ecebd9efd899ae5ef39e0552785aa':
Add StorageEventListener.onDiskDestroyed()
Amith Yamasani [Sat, 13 Jun 2015 00:13:42 +0000 (00:13 +0000)]
am
34365d35: am
c4422b05: am
480d6eb9: Merge "Fix negative inactiveTime on creating a new user" into mnc-dev
* commit '
34365d357185acf0df22ebc07dc37410c433841b':
Fix negative inactiveTime on creating a new user
Ruben Brunk [Sat, 13 Jun 2015 00:13:36 +0000 (00:13 +0000)]
am
03d4cdec: am
38998eaf: am
8491d2de: Merge "Fix rounding width." into mnc-dev
* commit '
03d4cdec71dc7b39970106887e1313f4e67c0823':
Fix rounding width.
Makoto Onuki [Sat, 13 Jun 2015 00:05:03 +0000 (00:05 +0000)]
am
80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev
* commit '
80b34d7b9da0e0738a4a1db78d83cd804372594b':
Add StorageEventListener.onDiskDestroyed()
Amith Yamasani [Fri, 12 Jun 2015 23:57:29 +0000 (23:57 +0000)]
am
c4422b05: am
480d6eb9: Merge "Fix negative inactiveTime on creating a new user" into mnc-dev
* commit '
c4422b05c2552b3f8712ee1d2a6e00b48beb693a':
Fix negative inactiveTime on creating a new user
Ruben Brunk [Fri, 12 Jun 2015 23:57:25 +0000 (23:57 +0000)]
am
38998eaf: am
8491d2de: Merge "Fix rounding width." into mnc-dev
* commit '
38998eaf6c6e27d2155c24aab895baa93af775a7':
Fix rounding width.
Makoto Onuki [Fri, 12 Jun 2015 23:56:09 +0000 (23:56 +0000)]
Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev
Adam Lesinski [Fri, 12 Jun 2015 23:52:34 +0000 (23:52 +0000)]
am
f667a062: am
30ad8de5: am
cd9d7b7b: Merge "App Standby: Convert constants to Settings.Global" into mnc-dev
* commit '
f667a062e91e0312af1267ee08a6ce9472510379':
App Standby: Convert constants to Settings.Global
OSDN Git Service
