OSDN Git Service
Chet Haase [Mon, 15 Jun 2015 16:19:37 +0000 (16:19 +0000)]
am
81b0c773: am
1f81e0bf: am
c03fa1ee: Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev
* commit '
81b0c773201066fd01426804c99efb394784e191':
Add isFilterBitmap() overrides where appropriate
Diego Perez [Mon, 15 Jun 2015 16:19:30 +0000 (16:19 +0000)]
am
dc73fc6d: am
e5d3170d: am
0524e97a: Merge "resolved conflicts for merge of
5a53816b to mnc-dev" into mnc-dev
* commit '
dc73fc6d4723d428667eb1e83b74912d1010f8ee':
Fix crash when shadowSize is 0
Jason Monk [Mon, 15 Jun 2015 16:19:25 +0000 (16:19 +0000)]
am
9d78fc8d: am
0c8fd1a1: am
4b8704c9: Merge "Don\'t try to get entries for uninstalled apps." into mnc-dev
* commit '
9d78fc8d29dde710fd91d4803a780d619969ff78':
Don't try to get entries for uninstalled apps.
Geoff Mendal [Mon, 15 Jun 2015 16:15:25 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE"
Chet Haase [Mon, 15 Jun 2015 16:08:07 +0000 (16:08 +0000)]
am
1f81e0bf: am
c03fa1ee: Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev
* commit '
1f81e0bfd4a6be5098054313e91b96cbb7c1d849':
Add isFilterBitmap() overrides where appropriate
Geoff Mendal [Mon, 15 Jun 2015 16:08:02 +0000 (09:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I740e7755470c466a703ae90265362ad3f49e9aba
Auto-generated-cl: translation import
Diego Perez [Mon, 15 Jun 2015 16:08:01 +0000 (16:08 +0000)]
am
e5d3170d: am
0524e97a: Merge "resolved conflicts for merge of
5a53816b to mnc-dev" into mnc-dev
* commit '
e5d3170d92add758ceac2167ba0feb81847bc5f3':
Fix crash when shadowSize is 0
Jason Monk [Mon, 15 Jun 2015 16:07:56 +0000 (16:07 +0000)]
am
0c8fd1a1: am
4b8704c9: Merge "Don\'t try to get entries for uninstalled apps." into mnc-dev
* commit '
0c8fd1a154f356ce95b7d029bcaf051b8cee181c':
Don't try to get entries for uninstalled apps.
Chet Haase [Mon, 15 Jun 2015 15:54:33 +0000 (15:54 +0000)]
am
c03fa1ee: Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev
* commit '
c03fa1ee54424b0c8b9ecdc06004c9dbdf4925f2':
Add isFilterBitmap() overrides where appropriate
Diego Perez [Mon, 15 Jun 2015 15:54:29 +0000 (15:54 +0000)]
am
0524e97a: Merge "resolved conflicts for merge of
5a53816b to mnc-dev" into mnc-dev
* commit '
0524e97ac333c685b43cd9dbe5a49b28371b8865':
Fix crash when shadowSize is 0
Jason Monk [Mon, 15 Jun 2015 15:54:25 +0000 (15:54 +0000)]
am
4b8704c9: Merge "Don\'t try to get entries for uninstalled apps." into mnc-dev
* commit '
4b8704c9e1024fa7aba66cce03cde78c7e10ba64':
Don't try to get entries for uninstalled apps.
Chet Haase [Mon, 15 Jun 2015 15:45:55 +0000 (15:45 +0000)]
Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev
Diego Perez [Mon, 15 Jun 2015 15:44:12 +0000 (15:44 +0000)]
Merge "resolved conflicts for merge of
5a53816b to mnc-dev" into mnc-dev
Chet Haase [Sun, 14 Jun 2015 14:45:32 +0000 (07:45 -0700)]
Add isFilterBitmap() overrides where appropriate
Issue #
21825791 add isFilterBitmap() override to appropriate Drawable subclasses
Change-Id: I5cbd72c034be79b0aa53815c7a5a8ea499e6e02d
Jason Monk [Mon, 15 Jun 2015 15:41:36 +0000 (15:41 +0000)]
Merge "Don't try to get entries for uninstalled apps." into mnc-dev
Jason Monk [Mon, 15 Jun 2015 15:38:03 +0000 (11:38 -0400)]
Don't try to get entries for uninstalled apps.
Bug:
21837824
Change-Id: I6f7bbc309e9edf1db12476f55ab8be424739fae0
Diego Perez [Mon, 15 Jun 2015 15:17:08 +0000 (16:17 +0100)]
resolved conflicts for merge of
5a53816b to mnc-dev
Change-Id: Ice1ba8cb9793432e18635e77f4e3309f50bb7b3f
Prashant Malani [Mon, 15 Jun 2015 15:00:43 +0000 (15:00 +0000)]
am
1e6c78e8: (-s ours) am
8fdeda3d: (-s ours) am
6a7fdbdd: (-s ours) am
a8cff2ac: (-s ours) am
327b481f: (-s ours) am
786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '
1e6c78e87203d73004be74c7a1e40e6b77c25dd6':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
Filip Gruszczynski [Mon, 15 Jun 2015 15:00:38 +0000 (15:00 +0000)]
am
677557a8: (-s ours) am
fc41fe26: am
5b15bd7b: am
94476be6: (-s ours) am
88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev
* commit '
677557a88420313ded51f79fc0d1cc1a949162d1':
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
Leon Scroggins III [Mon, 15 Jun 2015 15:00:33 +0000 (15:00 +0000)]
am
f95055b5: (-s ours) am
fdf48a16: am
0af86ee7: am
d7959d30: (-s ours) am
265d053d: am
81babaa3: am
7ffde4a6: am
e899576f: am
48b38452: am
a6932472: am
5b751c80: (-s ours) am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of
* commit '
f95055b5acbc59625aeb096ce93780b53fce1a1a':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
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
Prashant Malani [Mon, 15 Jun 2015 14:48:39 +0000 (14:48 +0000)]
am
8fdeda3d: (-s ours) am
6a7fdbdd: (-s ours) am
a8cff2ac: (-s ours) am
327b481f: (-s ours) am
786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '
8fdeda3d3af44a0fcaa472af171a1dc09d4e0529':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
Filip Gruszczynski [Mon, 15 Jun 2015 14:48:30 +0000 (14:48 +0000)]
am
fc41fe26: am
5b15bd7b: am
94476be6: (-s ours) am
88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev
* commit '
fc41fe263995069eb80bf1dd797e34532ce2ff1b':
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
Leon Scroggins III [Mon, 15 Jun 2015 14:48:26 +0000 (14:48 +0000)]
am
fdf48a16: am
0af86ee7: am
d7959d30: (-s ours) am
265d053d: am
81babaa3: am
7ffde4a6: am
e899576f: am
48b38452: am
a6932472: am
5b751c80: (-s ours) am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
fdf48a16b6d0a942595266cf6cbd2429fcfe0fed':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
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
Prashant Malani [Mon, 15 Jun 2015 14:37:21 +0000 (14:37 +0000)]
am
6a7fdbdd: (-s ours) am
a8cff2ac: (-s ours) am
327b481f: (-s ours) am
786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '
6a7fdbddf7f7cec3ce511994b05eaeb94d18da6a':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
Filip Gruszczynski [Mon, 15 Jun 2015 14:37:17 +0000 (14:37 +0000)]
am
5b15bd7b: am
94476be6: (-s ours) am
88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev
* commit '
5b15bd7b2d403cedf2c76729b3a38925f52be66b':
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
Leon Scroggins III [Mon, 15 Jun 2015 14:37:13 +0000 (14:37 +0000)]
am
0af86ee7: am
d7959d30: (-s ours) am
265d053d: am
81babaa3: am
7ffde4a6: am
e899576f: am
48b38452: am
a6932472: am
5b751c80: (-s ours) am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
0af86ee769845334d27aa969fce3feba3e255d34':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
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
Prashant Malani [Mon, 15 Jun 2015 14:30:35 +0000 (14:30 +0000)]
am
a8cff2ac: (-s ours) am
327b481f: (-s ours) am
786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '
a8cff2acb7cc18d1cf123f45eb4e47e1ab876a20':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
Filip Gruszczynski [Mon, 15 Jun 2015 14:30:30 +0000 (14:30 +0000)]
am
94476be6: (-s ours) am
88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev
* commit '
94476be6a4055d09413d51e489446bf220c440a6':
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
Leon Scroggins III [Mon, 15 Jun 2015 14:30:25 +0000 (14:30 +0000)]
am
d7959d30: (-s ours) am
265d053d: am
81babaa3: am
7ffde4a6: am
e899576f: am
48b38452: am
a6932472: am
5b751c80: (-s ours) am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
d7959d30b61962a905de6c5081dac6b2f7be65c1':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
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