OSDN Git Service
Dianne Hackborn [Thu, 16 Jul 2015 00:08:34 +0000 (00:08 +0000)]
am
e12c549b: am
0d04da1f: am
1cf8b0b6: Merge "Fix issue #
22124996: VI: Command Request not Active" into mnc-dev
* commit '
e12c549b7af979d49b092d8131a80df06e906f44':
Fix issue #
22124996: VI: Command Request not Active
Jim Miller [Thu, 16 Jul 2015 00:08:26 +0000 (00:08 +0000)]
am
baa370e1: am
db19e1de: Merge "Fix the build" into mnc-dr-dev
* commit '
baa370e16b3f71b70641087ea68dd9c991ffbaab':
Fix the build
Dianne Hackborn [Wed, 15 Jul 2015 23:51:34 +0000 (23:51 +0000)]
am
0d04da1f: am
1cf8b0b6: Merge "Fix issue #
22124996: VI: Command Request not Active" into mnc-dev
* commit '
0d04da1fb71960c79820bb04cb65c7c41125fcee':
Fix issue #
22124996: VI: Command Request not Active
Jim Miller [Wed, 15 Jul 2015 23:51:29 +0000 (23:51 +0000)]
am
db19e1de: Merge "Fix the build" into mnc-dr-dev
* commit '
db19e1ded0d9bec62e798c6ba7677eefa4ff7c64':
Fix the build
Svetoslav [Wed, 15 Jul 2015 23:47:43 +0000 (23:47 +0000)]
am
1f1f0cee: am
eb16e1fb: am
08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev
* commit '
1f1f0cee1023b5a39579bd258c09a18915f42789':
Make sure we get valid package name or fail.
Christopher Tate [Wed, 15 Jul 2015 23:47:37 +0000 (23:47 +0000)]
am
ec0ed98d: am
b6b97e90: am
06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev
* commit '
ec0ed98da87c21109e8acd5e3160c5e9397e9d6c':
Resolve based on the correct user's default browser
Dianne Hackborn [Wed, 15 Jul 2015 23:39:12 +0000 (23:39 +0000)]
am
1cf8b0b6: Merge "Fix issue #
22124996: VI: Command Request not Active" into mnc-dev
* commit '
1cf8b0b6bfbbf867512fcd7bbb4763692821ed36':
Fix issue #
22124996: VI: Command Request not Active
Jim Miller [Wed, 15 Jul 2015 23:32:29 +0000 (23:32 +0000)]
Merge "Fix the build" into mnc-dr-dev
Svetoslav [Wed, 15 Jul 2015 23:30:09 +0000 (23:30 +0000)]
am
eb16e1fb: am
08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev
* commit '
eb16e1fb2225f2cf84f5c56242a187fba59e39f8':
Make sure we get valid package name or fail.
Christopher Tate [Wed, 15 Jul 2015 23:30:05 +0000 (23:30 +0000)]
am
b6b97e90: am
06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev
* commit '
b6b97e90cb247560b880ae7269b5bfb1daa7aeef':
Resolve based on the correct user's default browser
Dianne Hackborn [Wed, 15 Jul 2015 23:29:53 +0000 (23:29 +0000)]
Merge "Fix issue #
22124996: VI: Command Request not Active" into mnc-dev
Jim Miller [Wed, 15 Jul 2015 23:29:30 +0000 (16:29 -0700)]
Fix the build
Build broken due to a bad merge.
Change-Id: Id10b3db5d1bde2a2c9e8995e35b4fc58c5468544
Abodunrinwa Toki [Wed, 15 Jul 2015 23:21:35 +0000 (23:21 +0000)]
am
e3be3cc7: am
b2777867: am
6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
* commit '
e3be3cc76d0208f0cd39f0d15561f8ee060cc487':
Let the ActionBar handle keyboard shortcuts.
Svetoslav [Wed, 15 Jul 2015 23:13:03 +0000 (23:13 +0000)]
am
08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev
* commit '
08dda27be4678f2ab5bdc7e210d511ec105c158c':
Make sure we get valid package name or fail.
Christopher Tate [Wed, 15 Jul 2015 23:12:59 +0000 (23:12 +0000)]
am
06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev
* commit '
06476508c4aae6b9bb5affdc7470abf159ef9eda':
Resolve based on the correct user's default browser
Svetoslav [Wed, 15 Jul 2015 23:03:45 +0000 (23:03 +0000)]
Merge "Make sure we get valid package name or fail." into mnc-dev
Abodunrinwa Toki [Wed, 15 Jul 2015 23:03:45 +0000 (23:03 +0000)]
am
b2777867: am
6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
* commit '
b277786736e41525a232ad7ecb61de706311b295':
Let the ActionBar handle keyboard shortcuts.
Svetoslav [Wed, 15 Jul 2015 22:58:01 +0000 (15:58 -0700)]
Make sure we get valid package name or fail.
bug:
22492225
Change-Id: I7b7dce9a8e398c4615bcb700de80241e94c4320c
Miao Wang [Wed, 15 Jul 2015 22:58:03 +0000 (22:58 +0000)]
am
469b4114: am
675bed54: am
ad904cf3: Merge "fix BNNM docs" into mnc-dev
* commit '
469b4114bae83edeb92e420b5e688edc594df58b':
fix BNNM docs
Svet Ganov [Wed, 15 Jul 2015 22:57:56 +0000 (22:57 +0000)]
am
9088c083: am
12b05ec2: am
75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
* commit '
9088c083e6c66d44d3fe332de48b661dfe017254':
Grant default permissions to the setup app robustly.
Christopher Tate [Wed, 15 Jul 2015 22:57:49 +0000 (22:57 +0000)]
Merge "Resolve based on the correct user's default browser" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 22:57:51 +0000 (22:57 +0000)]
am
40e3b4b5: (-s ours) am
76b8b1e6: (-s ours) am
78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
40e3b4b5c10dbde39486a30bf37d13bf1464dfa5':
Import translations. DO NOT MERGE
Adrian Roos [Wed, 15 Jul 2015 22:57:45 +0000 (22:57 +0000)]
am
c71f3a2d: am
2fc6e2b5: am
3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev
* commit '
c71f3a2d4a3b3ab52be08e68646ffcb71b55066a':
Show correct locked orientation on phones
Geoff Mendal [Wed, 15 Jul 2015 22:57:40 +0000 (22:57 +0000)]
am
c7167010: (-s ours) am
9139d5b0: (-s ours) am
4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
c71670109681040c676895b1db962753db0414e9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:57:34 +0000 (22:57 +0000)]
am
a2ab4fc8: (-s ours) am
f88916ca: (-s ours) am
197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
a2ab4fc82629f200d93fa77a29094ff3ecb86af3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:57:28 +0000 (22:57 +0000)]
am
c05bf35e: (-s ours) am
ccec9777: (-s ours) am
6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
c05bf35e1771191d2f006e32f99a1d11479c2057':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:57:22 +0000 (22:57 +0000)]
am
80e9c04e: (-s ours) am
f48b416e: (-s ours) am
a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
80e9c04e910f88283f34dddac36f32db291e9c63':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:57:16 +0000 (22:57 +0000)]
am
69032a7a: (-s ours) am
0959738e: (-s ours) am
ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
69032a7a237f58a4b7f8f273cbce8cd25285b84b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:57:10 +0000 (22:57 +0000)]
am
15aa75e3: (-s ours) am
2e51738d: (-s ours) am
36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
15aa75e3f86f6a10512925f117240d7d2d8b291b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:57:05 +0000 (22:57 +0000)]
am
97eabdbd: (-s ours) am
f427688c: (-s ours) am
e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
97eabdbdc943ec361de9cb948676a75adc2723e8':
Import translations. DO NOT MERGE
Jorim Jaggi [Wed, 15 Jul 2015 22:56:59 +0000 (22:56 +0000)]
am
deb9aa8c: am
7be40aaa: am
eea8be53: Adjust assist disclosure stroke width to spec
* commit '
deb9aa8cfd89c04d130758f9a82e45f77bba0431':
Adjust assist disclosure stroke width to spec
Roshan Pius [Wed, 15 Jul 2015 22:56:53 +0000 (22:56 +0000)]
am
31ab86f8: am
06179c75: am
4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev
* commit '
31ab86f871be369075dd3432dcd4ebed14e50a78':
Handle exceptions when accessing Content providers.
Felipe Leme [Wed, 15 Jul 2015 22:56:46 +0000 (22:56 +0000)]
am
2ac41a90: am
d9ab0ca2: am
68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev
* commit '
2ac41a902eb4e2af32ff4063dca03b656baa860f':
Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
Dianne Hackborn [Wed, 15 Jul 2015 22:56:39 +0000 (22:56 +0000)]
am
f57b5e6f: am
4a56983f: am
d193916c: Merge "Fix build." into mnc-dev
* commit '
f57b5e6f23b9ec6f98d4af75072b87b09303e62d':
Fix build.
Jeff Brown [Wed, 15 Jul 2015 22:56:33 +0000 (22:56 +0000)]
am
8bdd92d4: am
0cb1cfdc: am
76c4c666: Add USB port manager.
* commit '
8bdd92d44ea878ff0353c87cfc5ce497aea96911':
Add USB port manager.
Jeff Brown [Wed, 15 Jul 2015 22:56:28 +0000 (22:56 +0000)]
am
b35b8e81: am
b3c11805: am
2dbccc19: Clean up USB Manager dump.
* commit '
b35b8e81cafe52552f800c736ce123d2b1969387':
Clean up USB Manager dump.
Abodunrinwa Toki [Wed, 15 Jul 2015 22:50:16 +0000 (22:50 +0000)]
am
6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
* commit '
6a4014104e85bf4154b353cd0be337f7967cdaeb':
Let the ActionBar handle keyboard shortcuts.
Miao Wang [Wed, 15 Jul 2015 22:46:05 +0000 (22:46 +0000)]
am
675bed54: am
ad904cf3: Merge "fix BNNM docs" into mnc-dev
* commit '
675bed5488edc7af164ca29258630d7c53984040':
fix BNNM docs
Svet Ganov [Wed, 15 Jul 2015 22:46:01 +0000 (22:46 +0000)]
am
12b05ec2: am
75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
* commit '
12b05ec2e7a22fa0cbc1bc55d5a8b6503dbf038c':
Grant default permissions to the setup app robustly.
Geoff Mendal [Wed, 15 Jul 2015 22:45:57 +0000 (22:45 +0000)]
am
76b8b1e6: (-s ours) am
78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
76b8b1e663553ecf92d669c02747692233545584':
Import translations. DO NOT MERGE
Adrian Roos [Wed, 15 Jul 2015 22:45:53 +0000 (22:45 +0000)]
am
2fc6e2b5: am
3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev
* commit '
2fc6e2b57ddfac58ce1fbded6f8a64a0b2fc9d70':
Show correct locked orientation on phones
Geoff Mendal [Wed, 15 Jul 2015 22:45:49 +0000 (22:45 +0000)]
am
9139d5b0: (-s ours) am
4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
9139d5b0fd3b523deb6fffe534fc07c462604483':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:45:45 +0000 (22:45 +0000)]
am
f88916ca: (-s ours) am
197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f88916cabcc3d4ce885226789ecbdb1a7db722b7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:45:41 +0000 (22:45 +0000)]
am
ccec9777: (-s ours) am
6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ccec9777f4ec0ac7d1f50e5b2e0a881d86d12a8b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:45:37 +0000 (22:45 +0000)]
am
f48b416e: (-s ours) am
a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f48b416e9806f374f95cfcfc35b60db82bb272a8':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:45:33 +0000 (22:45 +0000)]
am
0959738e: (-s ours) am
ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
0959738e5c0fda80bb655ae1fe317e3f395c6a72':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:45:29 +0000 (22:45 +0000)]
am
2e51738d: (-s ours) am
36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
2e51738d7c93e547dbd484014e11d770270030e0':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:45:24 +0000 (22:45 +0000)]
am
f427688c: (-s ours) am
e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f427688c37561a525927db8003c1fcb3f9cbed94':
Import translations. DO NOT MERGE
Jorim Jaggi [Wed, 15 Jul 2015 22:45:20 +0000 (22:45 +0000)]
am
7be40aaa: am
eea8be53: Adjust assist disclosure stroke width to spec
* commit '
7be40aaa6b1df159962134ff8314539d2805ec43':
Adjust assist disclosure stroke width to spec
Roshan Pius [Wed, 15 Jul 2015 22:45:16 +0000 (22:45 +0000)]
am
06179c75: am
4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev
* commit '
06179c75c84476e96b99004fb677ef9d50dbcdfc':
Handle exceptions when accessing Content providers.
Felipe Leme [Wed, 15 Jul 2015 22:45:11 +0000 (22:45 +0000)]
am
d9ab0ca2: am
68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev
* commit '
d9ab0ca287a9ab1b5af19d70cb9b13e0e16cfcba':
Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
Dianne Hackborn [Wed, 15 Jul 2015 22:45:07 +0000 (22:45 +0000)]
am
4a56983f: am
d193916c: Merge "Fix build." into mnc-dev
* commit '
4a56983fa707985fe5e5ab050acd7306e123d075':
Fix build.
Jeff Brown [Wed, 15 Jul 2015 22:45:03 +0000 (22:45 +0000)]
am
0cb1cfdc: am
76c4c666: Add USB port manager.
* commit '
0cb1cfdcc306f78030403c8da22bfcda630c5527':
Add USB port manager.
Jeff Brown [Wed, 15 Jul 2015 22:44:59 +0000 (22:44 +0000)]
am
b3c11805: am
2dbccc19: Clean up USB Manager dump.
* commit '
b3c1180538d46a0844620375b67a453acdb456fe':
Clean up USB Manager dump.
Abodunrinwa Toki [Wed, 15 Jul 2015 22:38:55 +0000 (22:38 +0000)]
Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
Miao Wang [Wed, 15 Jul 2015 22:34:47 +0000 (22:34 +0000)]
am
ad904cf3: Merge "fix BNNM docs" into mnc-dev
* commit '
ad904cf34219897da731eb65f9de53176cc39b20':
fix BNNM docs
Svet Ganov [Wed, 15 Jul 2015 22:28:10 +0000 (22:28 +0000)]
am
75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
* commit '
75f6b94a5d5cadb218725011729466e8e438b231':
Grant default permissions to the setup app robustly.
Geoff Mendal [Wed, 15 Jul 2015 22:28:06 +0000 (22:28 +0000)]
am
78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
78b6e6c742a7872ba23c3684c47ff714dbd80cf6':
Import translations. DO NOT MERGE
Adrian Roos [Wed, 15 Jul 2015 22:28:02 +0000 (22:28 +0000)]
am
3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev
* commit '
3a931d028a0c43fe276b0adfdc6b87ac48dd5df3':
Show correct locked orientation on phones
Geoff Mendal [Wed, 15 Jul 2015 22:27:58 +0000 (22:27 +0000)]
am
4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
4155d9f37762a6a91d47c383f9c3a9fd3aa7f884':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:27:54 +0000 (22:27 +0000)]
am
197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
197e7381576bee4b8e2e7195811fe94d1b1b28ec':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:27:44 +0000 (22:27 +0000)]
am
6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
6e149a2537167f90b1db2430c19ccdf064548b91':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:27:39 +0000 (22:27 +0000)]
am
a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
a5516e80ad76fb5cfe520ddd0c5babf2dccf2e5a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:27:35 +0000 (22:27 +0000)]
am
ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ff994bd31b2768eb38efb6c623f0fb6e13d9d61b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:27:31 +0000 (22:27 +0000)]
am
36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
36c103d685a6ba0f04c52bad2cb666789f5179dc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:27:26 +0000 (22:27 +0000)]
am
e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e2a0d44c8a837ac44dfc627ef3ca8d5242e78959':
Import translations. DO NOT MERGE
Jorim Jaggi [Wed, 15 Jul 2015 22:27:07 +0000 (22:27 +0000)]
am
eea8be53: Adjust assist disclosure stroke width to spec
* commit '
eea8be533874f279016279cd68618a6592b3dbed':
Adjust assist disclosure stroke width to spec
Roshan Pius [Wed, 15 Jul 2015 22:26:55 +0000 (22:26 +0000)]
am
4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev
* commit '
4e9c63cbe1712f750d5eaaa044e957c7f7696bf8':
Handle exceptions when accessing Content providers.
Felipe Leme [Wed, 15 Jul 2015 22:26:47 +0000 (22:26 +0000)]
am
68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev
* commit '
68fd7c798d213bbe304775b13d775ee868abb448':
Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
Dianne Hackborn [Wed, 15 Jul 2015 22:26:42 +0000 (22:26 +0000)]
am
d193916c: Merge "Fix build." into mnc-dev
* commit '
d193916c83015d54466ad998fb9373f15da754a7':
Fix build.
Jeff Brown [Wed, 15 Jul 2015 22:26:38 +0000 (22:26 +0000)]
am
76c4c666: Add USB port manager.
* commit '
76c4c6668a1486bc003ab0c585bb1f41d16e27a7':
Add USB port manager.
Jeff Brown [Wed, 15 Jul 2015 22:26:34 +0000 (22:26 +0000)]
am
2dbccc19: Clean up USB Manager dump.
* commit '
2dbccc1926ea2d3e27c5cfd2d61d2b3d5ed787c0':
Clean up USB Manager dump.
Miao Wang [Wed, 15 Jul 2015 22:21:11 +0000 (22:21 +0000)]
Merge "fix BNNM docs" into mnc-dev
Jeff Sharkey [Wed, 15 Jul 2015 22:11:24 +0000 (22:11 +0000)]
am
973e7227: am
6819696c: am
539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev
* commit '
973e72270ccbbd44f6e83690ba32735465bb170d':
Give DCS permission needed to measure all users.
Jeff Sharkey [Wed, 15 Jul 2015 22:11:18 +0000 (22:11 +0000)]
am
b5405b45: am
350b99c0: am
483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev
* commit '
b5405b45784cebf978b6102d324a1018fe66deb6':
Only send EXTRA_STACK for private intent.
Jim Miller [Wed, 15 Jul 2015 22:11:11 +0000 (22:11 +0000)]
am
204c2de8: am
c7b0435c: resolved conflicts for merge of
1d4247c4 to mnc-dr-dev
* commit '
204c2de8bb2a804991b8bbd5be9877ac1a52e150':
Improve tracking of screen on reasons.
Jeff Sharkey [Wed, 15 Jul 2015 21:59:36 +0000 (21:59 +0000)]
am
6819696c: am
539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev
* commit '
6819696c0e00ce3805de66f13ec6deda2489fd32':
Give DCS permission needed to measure all users.
Jeff Sharkey [Wed, 15 Jul 2015 21:59:31 +0000 (21:59 +0000)]
am
350b99c0: am
483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev
* commit '
350b99c0027902db22004ea037265349155d7c38':
Only send EXTRA_STACK for private intent.
Jim Miller [Wed, 15 Jul 2015 21:59:27 +0000 (21:59 +0000)]
am
c7b0435c: resolved conflicts for merge of
1d4247c4 to mnc-dr-dev
* commit '
c7b0435cc709c328da8e2b515ea04c8bc40d1094':
Improve tracking of screen on reasons.
Svet Ganov [Wed, 15 Jul 2015 21:58:47 +0000 (21:58 +0000)]
Merge "Grant default permissions to the setup app robustly." into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:56:25 +0000 (21:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Adrian Roos [Wed, 15 Jul 2015 21:56:12 +0000 (21:56 +0000)]
Merge "Show correct locked orientation on phones" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:55:49 +0000 (21:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:54:06 +0000 (21:54 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Christopher Tate [Wed, 15 Jul 2015 21:52:29 +0000 (14:52 -0700)]
Resolve based on the correct user's default browser
Bug
22509659
Change-Id: Iac75e7b40609bf2c81d266e0568fbfbeb71bb3aa
Geoff Mendal [Wed, 15 Jul 2015 21:50:46 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:48:18 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:47:12 +0000 (21:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Svet Ganov [Wed, 15 Jul 2015 18:04:18 +0000 (11:04 -0700)]
Grant default permissions to the setup app robustly.
There is a zoo of components that handle the home intent and
have different priority. There is no reliable way to distinguish
the setup app from the other apps that handle home as some of
them have lower priority than the setup app and some higher.
This change adds a dedicated category to recognize the default
setup app.
Uncommented the code that grants accounts permissions as the
get_accounts permission is now a runtime permission and can be
granted.
bug:
22471024
bug:
22501463
Change-Id: I41726751fa2567cbcd7d09c7acfa7615b8aba577
Geoff Mendal [Wed, 15 Jul 2015 21:44:00 +0000 (21:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jeff Sharkey [Wed, 15 Jul 2015 21:43:55 +0000 (21:43 +0000)]
am
539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev
* commit '
539f7ac7a195c405987057ef34e88cfbe8eab5e8':
Give DCS permission needed to measure all users.
Jeff Sharkey [Wed, 15 Jul 2015 21:43:48 +0000 (21:43 +0000)]
am
483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev
* commit '
483bd84280ef667e306ec7246d85423ca6b1fde7':
Only send EXTRA_STACK for private intent.
Geoff Mendal [Wed, 15 Jul 2015 21:41:14 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jim Miller [Wed, 15 Jul 2015 21:33:10 +0000 (14:33 -0700)]
resolved conflicts for merge of
1d4247c4 to mnc-dr-dev
Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a
Geoff Mendal [Wed, 15 Jul 2015 21:19:57 +0000 (14:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I428e579d5968139dcdf6e8e693f4d2eef182c682
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 21:17:17 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7e22afc43c9029b40ba2df53dfc10a9a688c4fd2
Auto-generated-cl: translation import
Jorim Jaggi [Tue, 14 Jul 2015 19:44:12 +0000 (12:44 -0700)]
Adjust assist disclosure stroke width to spec
Bug:
21568059
Change-Id: Ib1ddb8890715b98d36ed5827f053970a9d4a7173
Geoff Mendal [Wed, 15 Jul 2015 21:07:29 +0000 (14:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I376fa651ad29df01e4a7844a9e64508f4b163cf0
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 21:02:08 +0000 (14:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2960b24e8ab390425898ac33034b24ceae260a65
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 20:59:16 +0000 (13:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a4734ab26f74e593ace500f8ff19d280cf7a6a1
Auto-generated-cl: translation import