OSDN Git Service
Android Build Merger (Role) [Fri, 27 May 2016 03:03:01 +0000 (03:03 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
9aed8c2fa0 -s ours am:
02befc3229 -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:02:59 +0000 (03:02 +0000)]
Merge "Merge "add metrics for notification and group expansion" into nyc-dev am:
0f97b8fcbd am:
32b50d9c39" into nyc-mr1-dev-plus-aosp
Bill Yi [Fri, 27 May 2016 03:01:58 +0000 (03:01 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
9aed8c2fa0 -s ours
am:
02befc3229 -s ours
* commit '
02befc32293351a93a1ba073ff884e6135c0c121':
Import translations. DO NOT MERGE
Change-Id: If60580203a307385c138d41f41790e8ca3852120
Bill Yi [Fri, 27 May 2016 03:00:13 +0000 (03:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
cb8c569414 -s ours
am:
977d5bbfd2 -s ours
* commit '
977d5bbfd2f67d18978ab55fbf26cbcfc282283e':
Import translations. DO NOT MERGE
Change-Id: I85443596959d0cfd85225f2aa3c336eab2c042e4
Julia Reynolds [Fri, 27 May 2016 02:59:17 +0000 (02:59 +0000)]
Merge "Importance slider updates." into nyc-dev am:
2bf73e94c3
am:
19a8d034fb
* commit '
19a8d034fbdfb1a6d0ec4b9b808d82f30cbb834f':
Importance slider updates.
Change-Id: I257ec5f912b9036ec5f18ba249951dd80ad6bc4b
Jeff Sharkey [Fri, 27 May 2016 02:58:50 +0000 (02:58 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am:
36cbf5ca37
am:
bda14dd987
* commit '
bda14dd987498d4c75dcbbe7b4bba73db165c1c8':
Cache IMountService for isUserKeyUnlocked() calls.
Change-Id: Ic5577c55324a52e761919febc0cab9af0e18e919
Jason Monk [Fri, 27 May 2016 02:58:33 +0000 (02:58 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am:
72f19ff6f0
am:
628c714f3e
* commit '
628c714f3e3414155f4e477bfa8d76b520ced01b':
QS: Make hotspot go unavailable in airplane mode
Change-Id: I1db7a4e27b0e518509ac0e51e44c2f3fd781b38b
Robin Lee [Fri, 27 May 2016 02:58:19 +0000 (02:58 +0000)]
Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am:
33154deb70
am:
6c3cb2c392
* commit '
6c3cb2c3926182245a0e80a7e3c95ff04d032b06':
Check if we're connected before marking a UID blocked
Change-Id: Ib2b6ddd0d5a6e7a4b825a3113d275d753c5c08b0
Chris Wren [Fri, 27 May 2016 02:56:24 +0000 (02:56 +0000)]
Merge "add metrics for notification and group expansion" into nyc-dev am:
0f97b8fcbd
am:
32b50d9c39
* commit '
32b50d9c39f8ffd740d8e95549004559bed2f954':
Change-Id: I545c3ce7b10858d88866b17c800f7e6d82d7fae1
Bill Yi [Fri, 27 May 2016 02:47:12 +0000 (02:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
9aed8c2fa0 -s ours
* commit '
9aed8c2fa01785be20cd7cc07976670812bc84a0':
Import translations. DO NOT MERGE
Change-Id: I0305b137eed7ecf9e4b149a0f589e658de16811f
Bill Yi [Fri, 27 May 2016 02:46:32 +0000 (02:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
cb8c569414 -s ours
* commit '
cb8c569414121158adb2a627d4a91b47dd3c4362':
Import translations. DO NOT MERGE
Change-Id: I6ed4074aea21921c930baa71f5564b7dd847618e
Julia Reynolds [Fri, 27 May 2016 02:43:28 +0000 (02:43 +0000)]
Merge "Importance slider updates." into nyc-dev
am:
2bf73e94c3
* commit '
2bf73e94c389bf9457df132d6eaf294f9d35587f':
Importance slider updates.
Change-Id: Ia9d063f6422259f80aeee6fe2d27ca1354538955
Jeff Sharkey [Fri, 27 May 2016 02:42:44 +0000 (02:42 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
am:
36cbf5ca37
* commit '
36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
Cache IMountService for isUserKeyUnlocked() calls.
Change-Id: I1ad2d1eba64a89e7a22dc86c7241f6f85a5f2a0b
Jason Monk [Fri, 27 May 2016 02:42:04 +0000 (02:42 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev
am:
72f19ff6f0
* commit '
72f19ff6f057fff184c875194e802005f8e8fd08':
QS: Make hotspot go unavailable in airplane mode
Change-Id: Ia21b21a840106fcbd7ca534ee639f43c0487a396
Robin Lee [Fri, 27 May 2016 02:39:45 +0000 (02:39 +0000)]
Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev
am:
33154deb70
* commit '
33154deb700a8cf5df6fff39f0b3291d1278efa0':
Check if we're connected before marking a UID blocked
Change-Id: I7a2552f43c66b1b1adb094d3b91ef87648e57bde
Chris Wren [Fri, 27 May 2016 02:39:20 +0000 (02:39 +0000)]
resolve merge conflicts of
0f97b8f to nyc-mr1-dev
am:
5b3b72e7b7
* commit '
5b3b72e7b7a926ac954db23c2ceaf10aa9b32539':
add metrics for notification and group expansion
Change-Id: I2df2f6e2ba27e4368162ce0642c77ec0a559620e
Chris Wren [Fri, 27 May 2016 02:28:03 +0000 (22:28 -0400)]
resolve merge conflicts of
0f97b8f to nyc-mr1-dev
Change-Id: I5e03144e3ae95777eb651add098eabe8af6ad08e
Fyodor Kupolov [Fri, 27 May 2016 00:54:20 +0000 (00:54 +0000)]
Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
am:
2c5cbd4012
* commit '
2c5cbd4012aef736c94a7afc84a778623c639d10':
Clean up demo dir when leaving demo mode
Change-Id: Ia7891f8e5106130d669a1daa7fcc691db1f5e4c7
Fyodor Kupolov [Fri, 27 May 2016 00:48:37 +0000 (00:48 +0000)]
Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 26 May 2016 23:27:31 +0000 (23:27 +0000)]
Merge "Merge "boost starred people to at least high importance" into nyc-dev am:
8e5d7413b8 am:
9f7067bb80" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 26 May 2016 23:27:20 +0000 (23:27 +0000)]
Merge "Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am:
4c04097fdb am:
531cd8724c" into nyc-mr1-dev-plus-aosp
Chris Wren [Thu, 26 May 2016 23:25:35 +0000 (23:25 +0000)]
Merge "boost starred people to at least high importance" into nyc-dev am:
8e5d7413b8
am:
9f7067bb80
* commit '
9f7067bb80b79396992b719ac46e8ab47e00ff10':
boost starred people to at least high importance
Change-Id: Ie452e76ad683e916699d9bfa4ee6d687b6d5d961
Jonathan Basseri [Thu, 26 May 2016 23:24:45 +0000 (23:24 +0000)]
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am:
4c04097fdb
am:
531cd8724c
* commit '
531cd8724cad56e2a141dbe5acbe283372c21de4':
Change-Id: I60f30d1169e65fde080d398a06d2b543a0278238
Chris Wren [Thu, 26 May 2016 23:24:29 +0000 (23:24 +0000)]
Merge "boost starred people to at least high importance" into nyc-dev am:
8e5d7413b8
am:
6c751b2e60
* commit '
6c751b2e60868513f69f49a9b6662b9737979c94':
boost starred people to at least high importance
Change-Id: Ie853218f61b2e089937482d0545e9acef1fe36fd
Chris Wren [Thu, 26 May 2016 23:16:27 +0000 (23:16 +0000)]
Merge "boost starred people to at least high importance" into nyc-dev
am:
8e5d7413b8
* commit '
8e5d7413b85a7b202bc917eee4287762b13b864b':
boost starred people to at least high importance
Change-Id: I40d102f3534558894056b2048c629ca955975ca2
Jonathan Basseri [Thu, 26 May 2016 23:13:17 +0000 (23:13 +0000)]
resolve merge conflicts of
4c04097 to nyc-mr1-dev
am:
04c35e78db
* commit '
04c35e78dbd5bc6670b5bf4e72686f696745af13':
Change how TelephonyManager handles subscriptions.
Change-Id: Ie26627bb443603f1e5f017a8df243922d2955f3d
Jonathan Basseri [Thu, 26 May 2016 18:41:17 +0000 (11:41 -0700)]
resolve merge conflicts of
4c04097 to nyc-mr1-dev
Change-Id: I256514588af20985108f72a5e204811904f87c9c
Doris Ling [Thu, 26 May 2016 17:51:23 +0000 (17:51 +0000)]
Merge "Added new action for gesture settings." into nyc-mr1-dev
am:
ce8e88aaab
* commit '
ce8e88aaabdca9572a17e59e4d54db055a11e10a':
Added new action for gesture settings.
Change-Id: I0756549196b98e1abeece0af3ab4956204c05e9d
Bill Yi [Thu, 26 May 2016 17:51:19 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
62d1f54d04 -s ours
* commit '
62d1f54d0473261909dc515878fe23b64d279d1b':
Import translations. DO NOT MERGE
Change-Id: Ic7bb1288dc08b4646a643f62f1aebf7f5314baed
Bill Yi [Thu, 26 May 2016 17:33:40 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
06b1de25af -s ours
* commit '
06b1de25afb1a2bfce1cfc38a88584efc7d73c2f':
Import translations. DO NOT MERGE
Change-Id: Ic2199da26da3980ac74c09b92b6b39a83ec9e133
Doris Ling [Thu, 26 May 2016 17:20:53 +0000 (17:20 +0000)]
Merge "Added new action for gesture settings." into nyc-mr1-dev
TreeHugger Robot [Thu, 26 May 2016 17:07:54 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 17:07:23 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 26 May 2016 16:56:12 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:55:57 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Chris Wren [Thu, 26 May 2016 16:54:27 +0000 (16:54 +0000)]
Merge "add metrics for notification and group expansion" into nyc-dev
am:
0f97b8fcbd
* commit '
0f97b8fcbddbbd40f5cf45ba57a5d9db48a611a0':
add metrics for notification and group expansion
Change-Id: I32d730fcc03da49217d9c4ba2a27f41e15eca73f
Chris Wren [Thu, 26 May 2016 16:54:20 +0000 (16:54 +0000)]
Merge "boost starred people to at least high importance" into nyc-dev
am:
8e5d7413b8
* commit '
8e5d7413b85a7b202bc917eee4287762b13b864b':
boost starred people to at least high importance
Change-Id: I2cf177c7be3693d05132c8fdd75d5387854a8b88
Julia Reynolds [Thu, 26 May 2016 16:50:56 +0000 (16:50 +0000)]
Merge "Importance slider updates." into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:49:49 +0000 (16:49 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
Jason Monk [Thu, 26 May 2016 16:46:47 +0000 (16:46 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev
Robin Lee [Thu, 26 May 2016 16:42:16 +0000 (16:42 +0000)]
Merge "Check if we're connected before marking a UID blocked" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:35:28 +0000 (16:35 +0000)]
Merge "add metrics for notification and group expansion" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:35:20 +0000 (16:35 +0000)]
Merge "boost starred people to at least high importance" into nyc-dev
Android Build Merger (Role) [Thu, 26 May 2016 16:15:27 +0000 (16:15 +0000)]
Merge "Merge "Rename carrier messaging API constant." into nyc-dev am:
f7375b46ff am:
f8969b233c" into nyc-mr1-dev-plus-aosp
Ji Yang [Thu, 26 May 2016 16:12:57 +0000 (16:12 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev am:
f7375b46ff
am:
f8969b233c
* commit '
f8969b233c1637d4945e4fe2c3c9a35fef5019ed':
Rename carrier messaging API constant.
Change-Id: I770c85c4036de650f78bb0bdb57ea610049e9511
Jonathan Basseri [Thu, 26 May 2016 16:12:55 +0000 (16:12 +0000)]
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
am:
4c04097fdb
* commit '
4c04097fdbe0fe414a6fcb2d6174e295986a3f66':
Change how TelephonyManager handles subscriptions.
Change-Id: I5d63caf41cb55d3077f9a3c00f4f1cce6bbe5ddd
Ji Yang [Thu, 26 May 2016 16:12:55 +0000 (16:12 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev am:
f7375b46ff
am:
e6c6ca417d
* commit '
e6c6ca417da6f62de4bdebd7b380f12b751a08b7':
Rename carrier messaging API constant.
Change-Id: I9e2d1c3572a6e7658e6ba66a7d4c01fd4a4c805a
Ji Yang [Thu, 26 May 2016 15:54:38 +0000 (15:54 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev
am:
f7375b46ff
* commit '
f7375b46ff9848feba0a9632669d07384954d69e':
Rename carrier messaging API constant.
Change-Id: I476b10118136b13a49b1d55864bbef8e568d6c7e
Ji Yang [Thu, 26 May 2016 15:54:27 +0000 (15:54 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev
am:
f7375b46ff
* commit '
f7375b46ff9848feba0a9632669d07384954d69e':
Rename carrier messaging API constant.
Change-Id: I0e6713e07899cde7780b433c0f3053e344e6d327
Jonathan Basseri [Thu, 26 May 2016 15:50:03 +0000 (15:50 +0000)]
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
Ji Yang [Thu, 26 May 2016 15:40:11 +0000 (15:40 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev
Jeff Sharkey [Thu, 26 May 2016 15:31:04 +0000 (09:31 -0600)]
Cache IMountService for isUserKeyUnlocked() calls.
This avoids doing a ServiceManager lookup for every call through
this hot code-path.
Bug:
28946245
Change-Id: I210ce34b33e5b40a5ab4e92ddce87fc5e9964be2
Robin Lee [Tue, 24 May 2016 15:35:10 +0000 (16:35 +0100)]
Check if we're connected before marking a UID blocked
This kills the always-on test, and any third-party app that correctly
checks whether it's blocked before attempting to make a connection.
Only affects always-on VPN when lockdown=true.
Bug:
28909500
Change-Id: I87aa9598d3872ae2ec409c2b19d73052c21ec878
Julia Reynolds [Thu, 26 May 2016 15:07:49 +0000 (11:07 -0400)]
Importance slider updates.
Icon & tint.
Bug:
28911161
Change-Id: Id8c3a4b79326eb5073a600de49ac14ae7223b398
Michael Wright [Thu, 26 May 2016 15:02:50 +0000 (15:02 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am:
c396f0f70e
am:
28984d4d80
* commit '
28984d4d80affa52324f4c17caae30c6bc3bc3ab':
Change-Id: I4cd9b6ffa87be709845c7531cacac10978664f4e
Jason Monk [Wed, 25 May 2016 18:22:01 +0000 (14:22 -0400)]
QS: Make hotspot go unavailable in airplane mode
Put the hotspot tile in the unavailable state whenever airplane
mode is on.
Change-Id: I7a6eb54c2e89a7a9736c72d8e58ab58e7e82d0a6
Fixes:
28881032
Michael Wright [Thu, 26 May 2016 14:51:30 +0000 (14:51 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am:
c396f0f70e
am:
4f6ae7bbaa
* commit '
4f6ae7bbaa4654e14d70e9fa503ceb713c90c342':
DO NOT MERGE Remove Pointer Capture API
Change-Id: Ieceb1c9248bfc618ed1c70821d4cf746128bc679
Michael Wright [Thu, 26 May 2016 14:39:03 +0000 (14:39 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
am:
c396f0f70e
* commit '
c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
DO NOT MERGE Remove Pointer Capture API
Change-Id: Iede50a709849ed27cb9723a565b946e00fb23be7
Michael Wright [Thu, 26 May 2016 14:38:56 +0000 (14:38 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
am:
c396f0f70e
* commit '
c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
DO NOT MERGE Remove Pointer Capture API
Change-Id: I77cb742feacdd3b8af0cf33d4e7ab246f776417f
Android Build Merger (Role) [Thu, 26 May 2016 14:37:23 +0000 (14:37 +0000)]
Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am:
1cb6f9d8a4 am:
9b22e5b4e8" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 26 May 2016 14:37:12 +0000 (14:37 +0000)]
Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am:
1cb6f9d8a4 am:
754ddca748" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 26 May 2016 14:37:06 +0000 (14:37 +0000)]
Merge "Merge "Store work lock type even it uses unified lock" into nyc-dev am:
610fb8a3f2 am:
56181175a7" into nyc-mr1-dev-plus-aosp
Ricky Wai [Thu, 26 May 2016 14:35:45 +0000 (14:35 +0000)]
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am:
1cb6f9d8a4
am:
9b22e5b4e8
* commit '
9b22e5b4e80e9daadf2af6430607016839e1909c':
Add resetKeyStore() in LockSettingsService
Change-Id: Icf0caad400e9ab8fd04af6e79f049db406dce4a7
Ricky Wai [Thu, 26 May 2016 14:35:30 +0000 (14:35 +0000)]
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am:
1cb6f9d8a4
am:
754ddca748
* commit '
754ddca748d7a8d3e55f4d90c07ca140a7ed312d':
Add resetKeyStore() in LockSettingsService
Change-Id: Ic5d0e880c85754a4c198597c80c7eacfa1b1516a
Ricky Wai [Thu, 26 May 2016 14:34:30 +0000 (14:34 +0000)]
Merge "Store work lock type even it uses unified lock" into nyc-dev am:
610fb8a3f2
am:
56181175a7
* commit '
56181175a7717dc1d8ea58cdd2ecdcb252119304':
Store work lock type even it uses unified lock
Change-Id: I0e2c41d37e25c463c60de8d8f6196b2612550b06
Ricky Wai [Thu, 26 May 2016 14:34:01 +0000 (14:34 +0000)]
Merge "Store work lock type even it uses unified lock" into nyc-dev am:
610fb8a3f2
am:
7c46f928f4
* commit '
7c46f928f4ef3998f16084cb5eeb732c0d2b21e7':
Store work lock type even it uses unified lock
Change-Id: I944565b7120f1bb6440a9f0a51831b326564ce05
Ricky Wai [Thu, 26 May 2016 14:03:51 +0000 (14:03 +0000)]
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
am:
1cb6f9d8a4
* commit '
1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
Add resetKeyStore() in LockSettingsService
Change-Id: I6af43eb9f472c1d5a1f9356a9b618a183200e38e
Ricky Wai [Thu, 26 May 2016 14:03:51 +0000 (14:03 +0000)]
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
am:
1cb6f9d8a4
* commit '
1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
Add resetKeyStore() in LockSettingsService
Change-Id: I0125a334fac098183e68fa0b9cd24bda64a88fae
Michael Wright [Thu, 26 May 2016 14:03:46 +0000 (14:03 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
Ricky Wai [Thu, 26 May 2016 14:02:12 +0000 (14:02 +0000)]
Merge "Store work lock type even it uses unified lock" into nyc-dev
am:
610fb8a3f2
* commit '
610fb8a3f2dcdc66dbc4e31d92a08cc249b5ca7b':
Store work lock type even it uses unified lock
Change-Id: I98c209ec1c3fd63d2abd597f1f38d9fc86dd5275
Ricky Wai [Thu, 26 May 2016 14:02:06 +0000 (14:02 +0000)]
Merge "Store work lock type even it uses unified lock" into nyc-dev
am:
610fb8a3f2
* commit '
610fb8a3f2dcdc66dbc4e31d92a08cc249b5ca7b':
Store work lock type even it uses unified lock
Change-Id: I89e322d1f21964074a3deec2fcc9a507c496d36e
Ricky Wai [Thu, 26 May 2016 13:46:25 +0000 (13:46 +0000)]
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
Ricky Wai [Thu, 26 May 2016 13:46:11 +0000 (13:46 +0000)]
Merge "Store work lock type even it uses unified lock" into nyc-dev
Android Build Merger (Role) [Thu, 26 May 2016 11:16:59 +0000 (11:16 +0000)]
Merge "Merge "Use correct user id when checking uri grants for notification." into nyc-dev am:
19d34821b9 am:
eb6ce93432" into nyc-mr1-dev-plus-aosp
Nicolas Prévot [Thu, 26 May 2016 11:16:33 +0000 (11:16 +0000)]
Merge "Use correct user id when checking uri grants for notification." into nyc-dev am:
19d34821b9
am:
eb6ce93432
* commit '
eb6ce934323c487a36426cc62b38a1439b2d12df':
Use correct user id when checking uri grants for notification.
Change-Id: I9e5ae930570f6a7720d597e8642c8a91ad37e348
Nicolas Prévot [Thu, 26 May 2016 11:16:24 +0000 (11:16 +0000)]
Merge "Use correct user id when checking uri grants for notification." into nyc-dev am:
19d34821b9
am:
37b0156d21
* commit '
37b0156d21d05f2f00cdbcd0374be73f79f3c900':
Use correct user id when checking uri grants for notification.
Change-Id: I2e4117c532749ba84df3baa297a26d44f54c2ab4
Nicolas Prevot [Thu, 26 May 2016 11:06:30 +0000 (11:06 +0000)]
Merge "Use correct user id when checking uri grants for notification." into nyc-dev
am:
19d34821b9
* commit '
19d34821b9c0a74d4269fff0bee87a7f486e1603':
Use correct user id when checking uri grants for notification.
Change-Id: I13aff9bc96e465e5a18c8ec44c3c709bc221a8b1
Nicolas Prevot [Thu, 26 May 2016 11:06:30 +0000 (11:06 +0000)]
Merge "Use correct user id when checking uri grants for notification." into nyc-dev
am:
19d34821b9
* commit '
19d34821b9c0a74d4269fff0bee87a7f486e1603':
Use correct user id when checking uri grants for notification.
Change-Id: Ic5a0e511f7f844e38fba10adb87a059f83673201
Nicolas Prévot [Thu, 26 May 2016 10:37:31 +0000 (10:37 +0000)]
Merge "Use correct user id when checking uri grants for notification." into nyc-dev
Android Build Merger (Role) [Thu, 26 May 2016 09:18:12 +0000 (09:18 +0000)]
Merge "Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev am:
03a1314f2e am:
5ede03bfd5" into nyc-mr1-dev-plus-aosp
Yi Kong [Thu, 26 May 2016 09:16:31 +0000 (09:16 +0000)]
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev am:
03a1314f2e
am:
8ea65f2264
* commit '
8ea65f22640576de4bd64ac4abf490bf62e65320':
Docs: Update content license page to include Javadocs licenses
Change-Id: I848e1e74115ad542c9c6ae4517ac645742d56315
Yi Kong [Thu, 26 May 2016 09:16:25 +0000 (09:16 +0000)]
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev am:
03a1314f2e
am:
5ede03bfd5
* commit '
5ede03bfd54875cf7d54706306a801d798c81af0':
Docs: Update content license page to include Javadocs licenses
Change-Id: I87ba582c31e6c0dced6523fd89cad0e28ec58a9f
Yi Kong [Thu, 26 May 2016 09:09:08 +0000 (09:09 +0000)]
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
am:
03a1314f2e
* commit '
03a1314f2e9040d48488c7cf38dba273ba669284':
Docs: Update content license page to include Javadocs licenses
Change-Id: Id2217b3e60ac0c5325f2fb1eb3c2fc19445d0577
Yi Kong [Thu, 26 May 2016 09:09:02 +0000 (09:09 +0000)]
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
am:
03a1314f2e
* commit '
03a1314f2e9040d48488c7cf38dba273ba669284':
Docs: Update content license page to include Javadocs licenses
Change-Id: I350ceeb794b065cbc735cda75fff010ee31fd9f4
Yi Kong [Thu, 26 May 2016 08:54:56 +0000 (08:54 +0000)]
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
Bill Yi [Thu, 26 May 2016 08:00:46 +0000 (01:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iceb3a8f6bffa9f71096eb05e483f2b7913289745
Auto-generated-cl: translation import
Bill Yi [Thu, 26 May 2016 07:41:49 +0000 (00:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I20074824d92bd827a9f12d13f659d52286be1007
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 26 May 2016 06:42:01 +0000 (06:42 +0000)]
Merge "Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am:
40585321d7 am:
304519b9b9" into nyc-mr1-dev-plus-aosp
Lajos Molnar [Thu, 26 May 2016 06:41:27 +0000 (06:41 +0000)]
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am:
40585321d7
am:
304519b9b9
* commit '
304519b9b949157827425a5467496a321e79c3a2':
media: check profile, level and bitrate for isFormatSupported
Change-Id: I69f3066b451ab238caf5421bd12131d3648012ce
Lajos Molnar [Thu, 26 May 2016 06:41:17 +0000 (06:41 +0000)]
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev am:
40585321d7
am:
e3d6b69562
* commit '
e3d6b6956274a2b6036a60f677e1a98c5ec3012e':
media: check profile, level and bitrate for isFormatSupported
Change-Id: I23379a661cfb1cc6c072ac859b4cc0a1078a5e2f
Lajos Molnar [Thu, 26 May 2016 06:27:34 +0000 (06:27 +0000)]
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
am:
40585321d7
* commit '
40585321d7b036ce7f609fbf10e8730deb1ad456':
media: check profile, level and bitrate for isFormatSupported
Change-Id: I86e99d56a5048554fe02f9472f8e81dfe0fbc15a
Lajos Molnar [Thu, 26 May 2016 06:27:26 +0000 (06:27 +0000)]
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
am:
40585321d7
* commit '
40585321d7b036ce7f609fbf10e8730deb1ad456':
media: check profile, level and bitrate for isFormatSupported
Change-Id: I55d0e328c5da0fb2eef0f0f1ef57a2b59702c972
Lajos Molnar [Thu, 26 May 2016 06:14:03 +0000 (06:14 +0000)]
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
Android Build Merger (Role) [Thu, 26 May 2016 06:07:23 +0000 (06:07 +0000)]
Merge "Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a am:
a7c0788467 am:
1cf99365cb am:
a283dabdf5 am:
970446d0ac" into nyc-mr1-dev-plus-aosp
Dirk Dougherty [Thu, 26 May 2016 06:06:49 +0000 (06:06 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a am:
a7c0788467 am:
1cf99365cb am:
a283dabdf5
am:
74083c0b6b
* commit '
74083c0b6b1a171a1b8ad0ba7db708fc2f22bef3':
Remove spurious url reference.
Change-Id: I220eafc9d31dc9fe3e71fb30ea736cf02ae96cc1
Dirk Dougherty [Thu, 26 May 2016 06:06:42 +0000 (06:06 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a am:
a7c0788467 am:
1cf99365cb am:
a283dabdf5
am:
970446d0ac
* commit '
970446d0acdb6668f1d79ea08534d6c90298c022':
Remove spurious url reference.
Change-Id: I496a2b01ea84f38276ac4ec09eca92a3e6b968fd
Dirk Dougherty [Thu, 26 May 2016 05:53:48 +0000 (05:53 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a am:
a7c0788467 am:
1cf99365cb
am:
a283dabdf5
* commit '
a283dabdf51427dfb5b8be0e6ab86292cb56b72d':
Remove spurious url reference.
Change-Id: I3d702473090d1fdf9320d359dc0d6feb4eba47c6
Dirk Dougherty [Thu, 26 May 2016 05:53:44 +0000 (05:53 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a am:
a7c0788467 am:
1cf99365cb
am:
a283dabdf5
* commit '
a283dabdf51427dfb5b8be0e6ab86292cb56b72d':
Remove spurious url reference.
Change-Id: I9e5ff9472a5434791a4358b92bb40956c2a2e85d
Dirk Dougherty [Thu, 26 May 2016 05:44:29 +0000 (05:44 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a am:
a7c0788467
am:
1cf99365cb
* commit '
1cf99365cb98174bd4300c7f0c799e94f6aab907':
Remove spurious url reference.
Change-Id: I744e556ebdb729314542dd9115346d42daf63e09
Dirk Dougherty [Thu, 26 May 2016 05:35:46 +0000 (05:35 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a
am:
a7c0788467
* commit '
a7c0788467d865e72ddbaa5862382d8ecc164039':
Remove spurious url reference.
Change-Id: Ifb9a772d89c60124334b3a78a2f5864f879d104f
OSDN Git Service
