OSDN Git Service
Android Build Merger (Role) [Fri, 3 Jun 2016 17:25:50 +0000 (17:25 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
f79616b427 -s ours am:
c29b39b95f -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Fri, 3 Jun 2016 17:23:42 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
12d1f5d5c0 -s ours
* commit '
12d1f5d5c0d9c1fbff66bd838c5d534893fba686':
Import translations. DO NOT MERGE
Change-Id: Ibf1708ca58c41463210831363d4aa667a305a193
Bill Yi [Fri, 3 Jun 2016 17:23:42 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
f79616b427 -s ours
am:
c29b39b95f -s ours
* commit '
c29b39b95f545e4c585d67fed17e3c59f3ef901a':
Import translations. DO NOT MERGE
Change-Id: I7ada5df98e9d67b7991e73000c5c8cc885a8ff71
Bill Yi [Fri, 3 Jun 2016 17:23:38 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
3cfbe6e7ea -s ours
* commit '
3cfbe6e7eaa40f28f6550a3dcaffe7cdc6eac121':
Import translations. DO NOT MERGE
Change-Id: I4a2f25168a33676c7caf95765c004c71c333ecd8
Bill Yi [Fri, 3 Jun 2016 17:23:35 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
7d84e110cb -s ours
* commit '
7d84e110cb7a6012a7cebb40a41198b36d129446':
Import translations. DO NOT MERGE
Change-Id: I562c0bc2db023fe46e04dfccac0588a84b4067ba
Bill Yi [Fri, 3 Jun 2016 17:23:32 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
d8a450557e -s ours
* commit '
d8a450557eadb7869cdf7a9a69dec30c85828406':
Import translations. DO NOT MERGE
Change-Id: I56f1f226de2d4631b76c5b343d27e3e8b76c4a11
Bill Yi [Fri, 3 Jun 2016 17:23:28 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
cb4bea3ae8 -s ours
* commit '
cb4bea3ae8d76b54b0d54c8ae51dd2ef7f64bbfe':
Import translations. DO NOT MERGE
Change-Id: Ia24ecde1804a2478505923121cedf9550924752a
Bill Yi [Fri, 3 Jun 2016 17:13:09 +0000 (17:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
a68d1f10e2 -s ours
am:
5c2575071e -s ours
* commit '
5c2575071e95e8efbb73f1a78f8dc382eda6e453':
Import translations. DO NOT MERGE
Change-Id: I876ee6b17f993d8ef7ede529c8bf7118abc80439
Bill Yi [Fri, 3 Jun 2016 17:13:08 +0000 (17:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
2130b28754 -s ours
am:
bcd2ea35c0 -s ours
* commit '
bcd2ea35c0d51ba0cb193078a546235ffd3b3e3d':
Import translations. DO NOT MERGE
Change-Id: I24dc4ae1290f9bd92b82793ebb394df6adab4a2a
Bill Yi [Fri, 3 Jun 2016 17:13:04 +0000 (17:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
ef2989920d -s ours
am:
f089201e2e -s ours
* commit '
f089201e2e574f6a3bce81253b385d6f67d20532':
Import translations. DO NOT MERGE
Change-Id: I5b1436cfb9cb51a6be47e6e7c52556727f8811e5
Bill Yi [Fri, 3 Jun 2016 17:13:02 +0000 (17:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
3d9d9fa0d9 -s ours
am:
67ae5a2251 -s ours
* commit '
67ae5a22517ff68547171588c09ae9ce3e95080b':
Import translations. DO NOT MERGE
Change-Id: Iab1bf41b422aa0e7bd8508b2c7afb288f6413497
Bill Yi [Fri, 3 Jun 2016 17:13:01 +0000 (17:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
cace07e727 -s ours
am:
479f70c516 -s ours
* commit '
479f70c5167806d916bceb7f241227f90ccd3242':
Import translations. DO NOT MERGE
Change-Id: I122d411f09df424963f85f9c75b2f2abec92456e
Bill Yi [Fri, 3 Jun 2016 17:12:33 +0000 (17:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
f79616b427 -s ours
* commit '
f79616b4277f477985f96f8a486126a389905c7d':
Import translations. DO NOT MERGE
Change-Id: Ia6869ed50d88aea53c3c42e02337eaecf1dd870f
Bill Yi [Fri, 3 Jun 2016 17:05:19 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
9d41bf11df -s ours
* commit '
9d41bf11dfbf2e239babedd580c2fa45aef036d7':
Import translations. DO NOT MERGE
Change-Id: I54cc8b7c4d7dde1567661beb2055e0c3e7011c2f
Bill Yi [Fri, 3 Jun 2016 17:05:15 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
e30eb8b3ba -s ours
* commit '
e30eb8b3bac31c09b9a68e74b40f497a8e1c570f':
Import translations. DO NOT MERGE
Change-Id: I9c3b3fe14de85880737f58a67b649b90685121aa
Bill Yi [Fri, 3 Jun 2016 17:05:11 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
c31029409a -s ours
* commit '
c31029409ada1e0c4a914b26e64cd0ac0820a323':
Import translations. DO NOT MERGE
Change-Id: I72a678ae2aa88ee246fbc5ed276fdcd3d52eaa33
Bill Yi [Fri, 3 Jun 2016 17:05:07 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
b51541753a -s ours
* commit '
b51541753a6267065d93a0846060467ce5bf1688':
Import translations. DO NOT MERGE
Change-Id: I63d94012dae2053fa343ad5ffc0bf0751a46e6b5
Bill Yi [Fri, 3 Jun 2016 17:05:04 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
4233404ee4 -s ours
* commit '
4233404ee4f33a55dcee898939d19b78e4b027c8':
Import translations. DO NOT MERGE
Change-Id: I02e0874f7a79ff45eca3498340e7d19b9d0cdd28
Bill Yi [Fri, 3 Jun 2016 17:04:14 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
a68d1f10e2 -s ours
* commit '
a68d1f10e2c20e128215406b4d6f4fb835481324':
Import translations. DO NOT MERGE
Change-Id: Ic08e6e8dcb28ab89c072abe20633c71d7695277e
Bill Yi [Fri, 3 Jun 2016 17:04:08 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
2130b28754 -s ours
* commit '
2130b287549b010b405bc72d04f07fb1bd070ba5':
Import translations. DO NOT MERGE
Change-Id: Ib9e163aa0e74fdd6c9b22c292e9651d153e117a4
Bill Yi [Fri, 3 Jun 2016 17:04:02 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
ef2989920d -s ours
* commit '
ef2989920d00f19d5dcd86bd521eec86bc058754':
Import translations. DO NOT MERGE
Change-Id: I4c4da499fab8a30733235849a336876442e46125
Bill Yi [Fri, 3 Jun 2016 17:03:59 +0000 (17:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
3d9d9fa0d9 -s ours
* commit '
3d9d9fa0d97974fc2dbd65ed1bd5b0995b3c347a':
Import translations. DO NOT MERGE
Change-Id: I02a8d1407296ab018dab851a235fce0c8c75013c
Bill Yi [Fri, 3 Jun 2016 17:03:50 +0000 (17:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
cace07e727 -s ours
* commit '
cace07e7271723232277e8dfe94799c80926c5ea':
Import translations. DO NOT MERGE
Change-Id: I7b6473f40f64a17b4f7417cf28c1e24d36a9c3ff
TreeHugger Robot [Fri, 3 Jun 2016 16:58:05 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:57:49 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:57:44 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:57:27 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:57:21 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:56:56 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:56:40 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:56:15 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:55:56 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:55:38 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:55:20 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:55:01 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:54:39 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:53:47 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:53:27 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:53:12 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Robert Greenwalt [Fri, 3 Jun 2016 16:44:29 +0000 (16:44 +0000)]
Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
am:
6a5c9560a3
* commit '
6a5c9560a33337fc82362d77bc4bae633953428d':
Add support for UNSOL PCO Data.
Change-Id: Idcf20b421f1174b3ddacaa6fde33b221a5ecbccf
Robert Greenwalt [Fri, 3 Jun 2016 16:38:57 +0000 (16:38 +0000)]
Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
Android Build Merger (Role) [Fri, 3 Jun 2016 16:14:15 +0000 (16:14 +0000)]
Merge "Merge "Fix BigText transitions" into nyc-dev am:
2ab4f451dc am:
d49a86ceda" into nyc-mr1-dev-plus-aosp
Adrian Roos [Fri, 3 Jun 2016 16:13:46 +0000 (16:13 +0000)]
Merge "Fix BigText transitions" into nyc-dev am:
2ab4f451dc
am:
50844bc504
* commit '
50844bc50429e6e6f4f0d33b177491c25f47e6ce':
Fix BigText transitions
Change-Id: I822241014f796954ee80e5d3ad2ba747f2ef1f03
Adrian Roos [Fri, 3 Jun 2016 16:13:44 +0000 (16:13 +0000)]
Merge "Fix BigText transitions" into nyc-dev am:
2ab4f451dc
am:
d49a86ceda
* commit '
d49a86ceda243515019d267d4fbecc3cc99cb456':
Fix BigText transitions
Change-Id: Ife5601ffb5323f73e817881d47a7ead1c89f2504
Adrian Roos [Fri, 3 Jun 2016 15:53:09 +0000 (15:53 +0000)]
Merge "Fix BigText transitions" into nyc-dev
am:
2ab4f451dc
* commit '
2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
Fix BigText transitions
Change-Id: Ia211d3d625f2e28e7b756aadaab7b5594bbdb005
Adrian Roos [Fri, 3 Jun 2016 15:53:07 +0000 (15:53 +0000)]
Merge "Fix BigText transitions" into nyc-dev
am:
2ab4f451dc
* commit '
2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
Fix BigText transitions
Change-Id: I4705bacc68842c2a7ed178689e8efa53abc8e235
Makoto Onuki [Fri, 3 Jun 2016 15:37:10 +0000 (15:37 +0000)]
Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
am:
37087ad710
* commit '
37087ad710087755786c115508b14e053c47f882':
ShortcutManager: Implement usage report API
Change-Id: I4ac336f441fa2111d1d645b02a79dc717490c1c0
TreeHugger Robot [Fri, 3 Jun 2016 15:36:10 +0000 (15:36 +0000)]
Merge "Fix BigText transitions" into nyc-dev
Makoto Onuki [Fri, 3 Jun 2016 15:21:44 +0000 (15:21 +0000)]
Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 3 Jun 2016 13:47:12 +0000 (13:47 +0000)]
Merge "Don\'t leak guts. am:
cdf98e1964 am:
08cc30378c" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Fri, 3 Jun 2016 13:46:47 +0000 (13:46 +0000)]
Don\'t leak guts. am:
cdf98e1964
am:
0853233433
* commit '
0853233433958eb9c97d8237341be58895e8a541':
Don't leak guts.
Change-Id: Ifa768e26b323a46cd595feebaec2e947415b938e
Julia Reynolds [Fri, 3 Jun 2016 13:46:43 +0000 (13:46 +0000)]
Don\'t leak guts. am:
cdf98e1964
am:
08cc30378c
* commit '
08cc30378c12c47250ab05491346d940194a29f8':
Don't leak guts.
Change-Id: Ieea32af97aef5a75633112bb15bf6d6453080dab
Julia Reynolds [Fri, 3 Jun 2016 13:33:11 +0000 (13:33 +0000)]
Don\'t leak guts.
am:
cdf98e1964
* commit '
cdf98e1964489916c68e240bd92c2e0bedab3c2d':
Don't leak guts.
Change-Id: I4396a379812941015e8a8cdf4e9426f8503bce70
Julia Reynolds [Fri, 3 Jun 2016 13:33:08 +0000 (13:33 +0000)]
Don\'t leak guts.
am:
cdf98e1964
* commit '
cdf98e1964489916c68e240bd92c2e0bedab3c2d':
Don't leak guts.
Change-Id: Id7e53a4e108280c8b843413fa377ae40ea0acb2e
Julia Reynolds [Thu, 2 Jun 2016 20:04:56 +0000 (16:04 -0400)]
Don't leak guts.
Change-Id: I7a9080ce4d360ed67b884eb9cbd8597496388389
Fixes:
29064258
Bill Yi [Fri, 3 Jun 2016 13:09:07 +0000 (06:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2e818cdd84923a3b9cda7d4954ba5f492a9817f4
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 13:04:14 +0000 (06:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2fd4e7683d9c10652bacfc820593e07bd58cefc0
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 13:01:48 +0000 (06:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46dc39205d2e1652f96638ed246431742c63f93e
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 12:23:35 +0000 (05:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I733983cfcd864557c987aa746c3a3f2c249a9c12
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:57:35 +0000 (04:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I53789d03049f5647fff50cf5521b461bf5481afd
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:52:48 +0000 (04:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic52f441a17948a9d117126b1e808d05535cc558d
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:50:16 +0000 (04:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibee7d58074781c85c28496af8ad0702b51fd85a8
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:38:00 +0000 (04:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I680d494c4670c1ae92902559bf88849f043ba501
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:31:48 +0000 (04:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ad391c3e1b05ca8363ffca2837860946cd4570f
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:27:06 +0000 (04:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2bf24aac1ece07f78ad462b670824b85945b72f0
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:11:55 +0000 (04:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1af602c8252ce1006e26a8f965fe56e976fe3439
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:02:53 +0000 (04:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I10d88a14b6477e7ba128653756a84c56ea5034c3
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 10:57:53 +0000 (03:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia658676186e563e8e1e83c273fd76c011b9169ef
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 3 Jun 2016 10:55:27 +0000 (10:55 +0000)]
Merge "OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am:
33d03a9e43 am:
d73c6eb6f3" into nyc-mr1-dev-plus-aosp
Tony Mak [Fri, 3 Jun 2016 10:54:56 +0000 (10:54 +0000)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am:
33d03a9e43
am:
d73c6eb6f3
* commit '
d73c6eb6f3b7fa9ac7729e1e870b4285d42b9b44':
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
Change-Id: Ia07e1d86214ca226aa0802c2ab6f6628da631937
Tony Mak [Fri, 3 Jun 2016 10:54:46 +0000 (10:54 +0000)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am:
33d03a9e43
am:
fff6650de4
* commit '
fff6650de4ac847db61ffdf3fbc82a39e3878313':
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
Change-Id: Id88584fff3f69e554793ea1e99dd491796a470ff
Bill Yi [Fri, 3 Jun 2016 10:51:12 +0000 (03:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e9706b340786d79d7a9cdc4735137d3fcf2e840
Auto-generated-cl: translation import
Tony Mak [Fri, 3 Jun 2016 10:43:37 +0000 (10:43 +0000)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am:
33d03a9e43
* commit '
33d03a9e435eb474e3bdd3e958943e0057866477':
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
Change-Id: Ib8e3b7fae441adf95b928d7139455d3ca13c1fb6
Tony Mak [Fri, 3 Jun 2016 10:43:30 +0000 (10:43 +0000)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am:
33d03a9e43
* commit '
33d03a9e435eb474e3bdd3e958943e0057866477':
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
Change-Id: I2de02ec6febdc58ff9a79562059cc11e7d617be5
Bill Yi [Fri, 3 Jun 2016 10:43:29 +0000 (03:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib9d08e1380ee7258fc8a760cf82a10862b35ac84
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 10:36:04 +0000 (03:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iec10d485540939eca94ecf3d013cb7a9cda8c4f2
Auto-generated-cl: translation import
Tony Mak [Thu, 2 Jun 2016 14:01:16 +0000 (15:01 +0100)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
They are two different things.
OP_ACTIVATE_VPN means can we allow a vpn app to establish without user
interaction while DISALLOW_CONFIG_VPN means can the user modify vpn
config.
Testing:
1. Turn on DISALLOW_CONFIG_VPN, user cannot modify vpn config through
setting
2. Turn on DISALLOW_CONFIG_VPN, Dpm.setAlwaysOnVpn works.
3. Reboot after 2, vpn established automatically.
Bug:
29086229
Change-Id: I24899d6c7f0dd62bf441a44c6ee66fee35973a11
Android Build Merger (Role) [Fri, 3 Jun 2016 03:14:42 +0000 (03:14 +0000)]
Merge "Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8 am:
76297d719d am:
9ad88ce3fe am:
46a51cb108" into nyc-mr1-dev-plus-aosp
Eric Schmidt [Fri, 3 Jun 2016 03:14:18 +0000 (03:14 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8 am:
76297d719d am:
9ad88ce3fe
am:
46a51cb108
* commit '
46a51cb10804374700647399635db0ffb1bfcfbe':
docs: Fixed background optmizations code snippet
Change-Id: I95eaace44c1b0385f5d97ef3ddf726ae346551a0
Eric Schmidt [Fri, 3 Jun 2016 03:14:01 +0000 (03:14 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8 am:
76297d719d am:
9ad88ce3fe
am:
637ccf7585
* commit '
637ccf758567e128b248078e2bd8e99f7663cda8':
docs: Fixed background optmizations code snippet
Change-Id: Ib5bc0fb814758db2e2ad9352792085a9bc7fb74a
Eric Schmidt [Fri, 3 Jun 2016 03:06:49 +0000 (03:06 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8 am:
76297d719d
am:
9ad88ce3fe
* commit '
9ad88ce3fe653ddd6cc52c82b15ed7285de08ac6':
docs: Fixed background optmizations code snippet
Change-Id: Ib5aeb12e19841f86c8d625d4ea2b1a3f0df4e766
Eric Schmidt [Fri, 3 Jun 2016 03:06:44 +0000 (03:06 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8 am:
76297d719d
am:
9ad88ce3fe
* commit '
9ad88ce3fe653ddd6cc52c82b15ed7285de08ac6':
docs: Fixed background optmizations code snippet
Change-Id: I1a68f03403c34993525487f604422367f35fc0a0
Eric Schmidt [Fri, 3 Jun 2016 02:59:57 +0000 (02:59 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8
am:
76297d719d
* commit '
76297d719d5bbe2dcce65c357591c22b1a1d3293':
docs: Fixed background optmizations code snippet
Change-Id: I66a1141d843dedb78b3abbbfa7820367779087b9
Eric Schmidt [Fri, 3 Jun 2016 02:52:51 +0000 (02:52 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs
am:
0b8eb8c1e8
* commit '
0b8eb8c1e833d3f16aaf6e44f256c23537ae0500':
docs: Fixed background optmizations code snippet
Change-Id: I5fd02424afc2f99c7bd63f47e3cece88356546a1
Eric Schmidt [Fri, 3 Jun 2016 02:41:45 +0000 (02:41 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs
Andrii Kulian [Fri, 3 Jun 2016 02:15:57 +0000 (02:15 +0000)]
Merge "Fix task selection logic" into nyc-dev am:
265bd89c3c
am:
8aadde745f
* commit '
8aadde745fdd245a9263d81666fcd3f5f042f0fc':
Change-Id: I09d516df9e22030d82c5e10594274b0ebe1644f2
Andrii Kulian [Fri, 3 Jun 2016 02:10:04 +0000 (02:10 +0000)]
Merge "Fix task selection logic" into nyc-dev am:
265bd89c3c
am:
f4b91fe3e1
* commit '
f4b91fe3e18b98e575cf498a5fdbcd8ad9603ce1':
Fix task selection logic
Change-Id: I4d665fad6c972bdb11a192256d21f5fb9a27c96a
Andrii Kulian [Fri, 3 Jun 2016 02:07:11 +0000 (02:07 +0000)]
Merge "Fix task selection logic" into nyc-dev
am:
265bd89c3c
* commit '
265bd89c3cb6f99d38d2f126a88c12fc6502431c':
Fix task selection logic
Change-Id: If3b8b7d80885b7e5573b03f83f2cb31cfc0e6670
Zhijun He [Fri, 3 Jun 2016 02:07:10 +0000 (02:07 +0000)]
Merge "Camera2: add deferred output config support" into nyc-mr1-dev
am:
e8526a0105
* commit '
e8526a01051fc2b8929870c8bff28f1d6b8b652c':
Camera2: add deferred output config support
Change-Id: I5bfa1c90e4ab5910ccd3a8727b95200e4b4221ca
Andrii Kulian [Fri, 3 Jun 2016 02:07:04 +0000 (02:07 +0000)]
Merge "Fix task selection logic" into nyc-dev
am:
265bd89c3c
* commit '
265bd89c3cb6f99d38d2f126a88c12fc6502431c':
Fix task selection logic
Change-Id: Ic80d782ca53d8cf7a565a9337a686441edbd2c72
Andrii Kulian [Fri, 3 Jun 2016 01:37:50 +0000 (01:37 +0000)]
Merge "Fix task selection logic" into nyc-dev
Zhijun He [Fri, 3 Jun 2016 01:13:59 +0000 (01:13 +0000)]
Merge "Camera2: add deferred output config support" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 3 Jun 2016 01:05:02 +0000 (01:05 +0000)]
Merge "Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am:
0bc61eb176 am:
fa790104f2" into nyc-mr1-dev-plus-aosp
Pankaj Kanwar [Fri, 3 Jun 2016 01:04:30 +0000 (01:04 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am:
0bc61eb176
am:
fa790104f2
* commit '
fa790104f221563ebfd17813262c540b2751598c':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: I15c414be645c7aab9b2bd1262dd57b83ca8e652a
Pankaj Kanwar [Fri, 3 Jun 2016 01:04:27 +0000 (01:04 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am:
0bc61eb176
am:
c9e93d4294
* commit '
c9e93d42948bf3f9d4fce748b4c896a3a081bfde':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: I604d7fe975e3d7917014df470c9c42ada7d2808a
Pavlin Radoslavov [Fri, 3 Jun 2016 01:00:35 +0000 (01:00 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev
am:
0bc61eb176
* commit '
0bc61eb176644e243b0e131a29a5f66a4303d9b0':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: Ia2aed3304039a672961608fc900ab8996f67d716
Pavlin Radoslavov [Fri, 3 Jun 2016 01:00:34 +0000 (01:00 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev
am:
0bc61eb176
* commit '
0bc61eb176644e243b0e131a29a5f66a4303d9b0':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: I8953c12b4df0a60bd3649a055a4dbe03c93534e5
Pankaj Kanwar [Fri, 3 Jun 2016 00:55:48 +0000 (00:55 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev
Sanket Padawe [Fri, 3 Jun 2016 00:48:39 +0000 (00:48 +0000)]
Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev am:
b68601d247
am:
701cd3fe15
* commit '
701cd3fe15148f561c27b9a2b65da79b6f36c1c8':
Change-Id: Ic8ee22af2923a4c8847966d34b7e03712bcfc09e
Sanket Padawe [Fri, 3 Jun 2016 00:44:49 +0000 (00:44 +0000)]
Merge "Merge commit \'
b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev
am:
1a6b6fc266
* commit '
1a6b6fc2664305de6e7102fa96506910fb7705dd':
Add carrier config variables for overriding carrier name from carrierconf.
Change-Id: I2d9db536538179a4fdca78613408dfd492b822b4
OSDN Git Service
