OSDN Git Service
Amanda Kassay [Thu, 21 Jul 2016 17:09:39 +0000 (17:09 +0000)]
Merge \"Adding projec.yaml files to all top/sub categories.\" into nyc-dev
am:
5a76378471
Change-Id: Ib4e0a75117044599c72de287039c60f0391788c2
Amanda Kassay [Thu, 21 Jul 2016 17:02:12 +0000 (17:02 +0000)]
Merge "Adding projec.yaml files to all top/sub categories." into nyc-dev
Benjamin Franz [Thu, 21 Jul 2016 15:39:58 +0000 (15:39 +0000)]
Merge \\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093 am:
87534f4ac9 am:
cb805b35f3 -s ours
am:
662e2a7975
Change-Id: I453d98b170f1383ad41f5e73b8f0818240f4778d
Billy Lamberta [Thu, 21 Jul 2016 15:39:55 +0000 (15:39 +0000)]
Merge \"docs: work - Managed configuration bundles am:
ef57498142 am:
ba633fc919\" into nyc-dev
am:
7dbcfcadd5
Change-Id: Id738efd3e5b66db417b45231defc240a144744b7
Billy Lamberta [Thu, 21 Jul 2016 15:39:52 +0000 (15:39 +0000)]
docs: work - Managed configuration bundles am:
ef57498142 am:
9684f2cd2f
am:
c7cffa3e6a
Change-Id: Ifa84e7599721abebb5093f5e932166737278ccfc
Amanda Kassay [Thu, 21 Jul 2016 15:39:48 +0000 (15:39 +0000)]
Fix for b/
30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am:
83fb75ded3
am:
e9d58227bb
Change-Id: I29289c7aaaf34fb2889c8438f754b050b2dc2aec
Benjamin Franz [Thu, 21 Jul 2016 15:27:28 +0000 (15:27 +0000)]
Merge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093 am:
87534f4ac9
am:
cb805b35f3 -s ours
Change-Id: Icbc3d0dbcce8e079a895f194c13a5fa35957bc09
Android Build Merger (Role) [Thu, 21 Jul 2016 15:22:31 +0000 (15:22 +0000)]
Merge "docs: work - Managed configuration bundles am:
ef57498142 am:
ba633fc919" into nyc-dev
Mark Lu [Thu, 21 Jul 2016 15:22:14 +0000 (15:22 +0000)]
Merge \"docs: fixed \'@\' signs that were escaped improperly\" into nyc-dev
am:
a7ce29962c
Change-Id: I7444f59361841b6e6051c8976869633eb1c0219a
Billy Lamberta [Thu, 21 Jul 2016 15:21:58 +0000 (15:21 +0000)]
docs: work - Managed configuration bundles am:
ef57498142
am:
ba633fc919
Change-Id: I819bc7a7568f4ea753b053338c7f73f64e80ec0e
Billy Lamberta [Thu, 21 Jul 2016 15:21:52 +0000 (15:21 +0000)]
docs: work - Managed configuration bundles am:
ef57498142
am:
9684f2cd2f
Change-Id: Idaeea63ba30ecb86a4f60955bb4937357ba4fd1b
Amanda Kassay [Thu, 21 Jul 2016 15:21:50 +0000 (15:21 +0000)]
Fix for b/
30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html
am:
83fb75ded3
Change-Id: Ib5e4d45692c54beb3b4fafe89ebc0a5c19400359
Benjamin Franz [Thu, 21 Jul 2016 10:14:59 +0000 (10:14 +0000)]
Merge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093
am:
87534f4ac9
Change-Id: I05e37f474e496b41c39b7a160418d9f48a265fa3
Benjamin Franz [Thu, 21 Jul 2016 10:10:03 +0000 (10:10 +0000)]
Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am:
3e582390b3
am:
7abd7ba093
Change-Id: I8dd5c0934f135cd567ae6bf2f4edf759ed757dfe
Benjamin Franz [Thu, 21 Jul 2016 10:05:33 +0000 (10:05 +0000)]
Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
am:
3e582390b3
Change-Id: Ibb90e151746d405e1cc8a1eb889ffa91aca35bc8
Benjamin Franz [Thu, 21 Jul 2016 09:59:41 +0000 (09:59 +0000)]
Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev
Billy Lamberta [Wed, 20 Jul 2016 22:15:57 +0000 (22:15 +0000)]
docs: work - Managed configuration bundles
am:
ef57498142
Change-Id: I6186c90e5d7125d678db5c876dc47697e14e60d7
Billy Lamberta [Wed, 20 Jul 2016 22:15:39 +0000 (22:15 +0000)]
docs: work - Managed configuration bundles
am:
ef57498142
Change-Id: I8a874ca63bf3cbfa7c4abc3061f3cb8e19cd7486
Billy Lamberta [Mon, 11 Jul 2016 20:13:56 +0000 (13:13 -0700)]
docs: work - Managed configuration bundles
Update 'Set up Managed Configurations' guide to include
examples for restriction bundles and bundle_arrays.
Include table for restriction entry types and usage.
Link to EMM doc for building DPC. Formatting.
bug:
26151150
bug:
29966701
Change-Id: I89f732709fadd511b968515ab16f07dd46195f0e
Christopher Ferris [Wed, 20 Jul 2016 18:18:17 +0000 (18:18 +0000)]
Merge \\"Remove dependency on android_alarm.h.\\" am:
c95e7a3014
am:
8f7223e420
Change-Id: I7fd6c49a94b557772f3f2d9d2f751ef2fd42eee8
Amanda Kassay [Wed, 20 Jul 2016 18:11:24 +0000 (14:11 -0400)]
Fix for b/
30088807 Dashboard page repeating charts three times on mobile.
Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html
Change-Id: Iff6820353ff6fb3ec678ddfe209b2200ab872812
Christopher Ferris [Wed, 20 Jul 2016 18:10:47 +0000 (18:10 +0000)]
Merge \"Remove dependency on android_alarm.h.\"
am:
c95e7a3014
Change-Id: I19908fa29772c89b8112e371702da6197b20465d
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Remove dependency on android_alarm.h."
Mark Lu [Wed, 20 Jul 2016 16:48:24 +0000 (16:48 +0000)]
Merge "docs: fixed '@' signs that were escaped improperly" into nyc-dev
Paul Stewart [Wed, 20 Jul 2016 03:23:13 +0000 (03:23 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e
am:
a71fe00594
Change-Id: I93d600fe926037601f367697dd6f30f3ddca5e69
Paul Stewart [Wed, 20 Jul 2016 03:23:10 +0000 (03:23 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc
am:
47e801972c
Change-Id: Ib1ffaf10f47884fe64660ad5266d0057affe920c
Paul Stewart [Wed, 20 Jul 2016 03:23:05 +0000 (03:23 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours
am:
d77404a0e5
Change-Id: Ic7d1e557c9b1c0eb2d3cd18c1c7b8055638d1c3e
Paul Stewart [Wed, 20 Jul 2016 03:17:07 +0000 (03:17 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7
am:
a20314a28e
Change-Id: I54f5b652c5c5bc148a8058cea665aab5327c61ab
Paul Stewart [Wed, 20 Jul 2016 03:17:01 +0000 (03:17 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a
am:
6b05e285cc
Change-Id: I85e36294bd68be5da928d96dd7d9742f7fba53d3
Paul Stewart [Wed, 20 Jul 2016 03:16:50 +0000 (03:16 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9
am:
cf3595400b -s ours
Change-Id: I983c0d096671d522f3eed3eb3deacff300b50bb9
Paul Stewart [Wed, 20 Jul 2016 01:35:14 +0000 (01:35 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165
am:
2331eefef7
Change-Id: Ia0cccdca5f4e44ad4caf75240240eec73757e22b
Paul Stewart [Wed, 20 Jul 2016 01:35:10 +0000 (01:35 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437
am:
537535c14a
Change-Id: I0f9c27f32518f9c7bb1d3735741843178fc1dc02
Kevin Hufnagle [Wed, 20 Jul 2016 01:29:00 +0000 (01:29 +0000)]
Merge \\\\\"docs: Updated descriptions of device orientation angles.\\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52 am:
b9487874fe
am:
55b52a2b3f
Change-Id: Ib14b352efe5f10043b092e234a2b92f2c2aa2bc2
Paul Stewart [Wed, 20 Jul 2016 01:28:54 +0000 (01:28 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac
am:
a09b6ee165
Change-Id: I63a60f729f95f273bf1918689626ac83771c73ac
Paul Stewart [Wed, 20 Jul 2016 01:28:52 +0000 (01:28 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3
am:
b3ff6b4437
Change-Id: I51e07e2ab6b3bee89dada0b6bf1ce1bf52f78d2f
Paul Stewart [Wed, 20 Jul 2016 01:28:32 +0000 (01:28 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3
am:
eef477c8b9
Change-Id: I38649e47184a6b34a923037922fb6743f14fb6e1
Kevin Hufnagle [Wed, 20 Jul 2016 01:20:20 +0000 (01:20 +0000)]
Merge \\\\"docs: Updated descriptions of device orientation angles.\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52
am:
b9487874fe
Change-Id: I034ce5c4a115fa4b694569c66a7e764543191cf7
Paul Stewart [Wed, 20 Jul 2016 01:20:08 +0000 (01:20 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e
am:
c77f18b2a3
Change-Id: Id93c8ac53a78931c8fdba21b7c168e38a7ad7fe4
Paul Stewart [Wed, 20 Jul 2016 01:19:50 +0000 (01:19 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e
am:
1e9889d5ac
Change-Id: Ie0bfc4653bfe90335952110b38be2eeee418f98f
Paul Stewart [Wed, 20 Jul 2016 01:19:46 +0000 (01:19 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994
am:
f8d4c187a3
Change-Id: If6d30364da0246233415bc15a1dda7c297f7bf6b
Kevin Hufnagle [Wed, 20 Jul 2016 01:12:40 +0000 (01:12 +0000)]
Merge \\\"docs: Updated descriptions of device orientation angles.\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d
am:
a812012c52
Change-Id: Ifff8f0ca783a601dab3b4968a0e9708e34aa83f4
Paul Stewart [Wed, 20 Jul 2016 01:12:15 +0000 (01:12 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1
am:
0f9a968c0e
Change-Id: I5ef9b70287cd8b0beaa169f194e7011b8c354454
Paul Stewart [Wed, 20 Jul 2016 01:12:11 +0000 (01:12 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772
am:
6245774994
Change-Id: Ib82209c5c6b71f3c47feaa17c346f853288b0131
Paul Stewart [Wed, 20 Jul 2016 01:11:49 +0000 (01:11 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6
am:
d78a14531e
Change-Id: Id37927594f47a5a32b05b15c8e09df0fa4ea9569
Kevin Hufnagle [Wed, 20 Jul 2016 01:02:28 +0000 (01:02 +0000)]
Merge \\"docs: Updated descriptions of device orientation angles.\\" into mnc-docs am:
d312201b74
am:
6b4d2a2e6d
Change-Id: Idffebefeb70955553bf7539e1e225935cf57e82c
Paul Stewart [Wed, 20 Jul 2016 01:01:15 +0000 (01:01 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee
am:
701a6c1ed6
Change-Id: I34acfe2e2ab1da2615f5a7107a9879e7491b0857
Kevin Hufnagle [Wed, 20 Jul 2016 00:56:28 +0000 (00:56 +0000)]
Merge \"docs: Updated descriptions of device orientation angles.\" into mnc-docs
am:
d312201b74
Change-Id: Idfe0c0ec38bd33d64f5b8be602d24aec778fac09
Paul Stewart [Wed, 20 Jul 2016 00:54:33 +0000 (00:54 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b
am:
bb7439d8a1
Change-Id: I0aa11cbba826189e7e5e4e9196654c4f43157de0
Paul Stewart [Wed, 20 Jul 2016 00:54:27 +0000 (00:54 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d
am:
5d60d2f772
Change-Id: I1a0651d22571a4dec3b4b6ca97f6b62b930f1cc7
Paul Stewart [Wed, 20 Jul 2016 00:54:20 +0000 (00:54 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4
am:
e41e0064ee
Change-Id: I9582c9327b859c981cb75d6aad52bb5dd1fafe20
Kevin Hufnagle [Wed, 20 Jul 2016 00:45:08 +0000 (00:45 +0000)]
Merge "docs: Updated descriptions of device orientation angles." into mnc-docs
Paul Stewart [Wed, 20 Jul 2016 00:45:09 +0000 (00:45 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26
am:
c92e93c47b
Change-Id: I50ca54dc65b61cb2dbb550eb964bd50938595168
Paul Stewart [Wed, 20 Jul 2016 00:45:07 +0000 (00:45 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b
am:
700c72d01d
Change-Id: I6fc08163a75790e15d05ab952ad4e706a1391916
Paul Stewart [Wed, 20 Jul 2016 00:45:04 +0000 (00:45 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103
am:
e2a03026c4
Change-Id: Iba16c43199d5ab238ce129d37519f9c5a7ba2005
Paul Stewart [Wed, 20 Jul 2016 00:37:53 +0000 (00:37 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891
am:
2e85e2ef26
Change-Id: If8a2f4e1fcbb4adf6e2ddef438781fb83de04cc3
Paul Stewart [Wed, 20 Jul 2016 00:37:50 +0000 (00:37 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4
am:
bf4f010a5b
Change-Id: I7e57c484be20197748c40c80acd987802b43a734
Paul Stewart [Wed, 20 Jul 2016 00:37:44 +0000 (00:37 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9
am:
141477b103
Change-Id: Ie4c9d06d225a2b99ebb4411e4282ea792c67d26b
Paul Stewart [Wed, 20 Jul 2016 00:31:29 +0000 (00:31 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28
am:
58555ee891
Change-Id: I1032efe65d45995a79572f669cddc5a4cf6131d9
Paul Stewart [Wed, 20 Jul 2016 00:31:22 +0000 (00:31 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf
am:
3fbe9280a4
Change-Id: Ib3bea7489d319bb94a41f3c8cb0d8ec7e40b14b7
Paul Stewart [Wed, 20 Jul 2016 00:31:15 +0000 (00:31 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6
am:
df93deccf9
Change-Id: Iaeae846189a8f5fa38c5da988eec7879300f8ab5
Paul Stewart [Wed, 20 Jul 2016 00:25:20 +0000 (00:25 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229
am:
2169197e28
Change-Id: I24f2c9f59336454aa071acca44d6aca5b44fda4a
Paul Stewart [Wed, 20 Jul 2016 00:25:17 +0000 (00:25 +0000)]
Fix string equality comparison am:
1033c6fdbc
am:
fdd4fe53cf
Change-Id: Id179c734fc503abea1216e7c6057d4903a17f340
Paul Stewart [Wed, 20 Jul 2016 00:25:14 +0000 (00:25 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646
am:
fa4bbf4ad6
Change-Id: I3ec1ff70fdfc2fd2aabf22ad1b7b3dad27ad4674
Paul Stewart [Wed, 20 Jul 2016 00:17:49 +0000 (00:17 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev
am:
77b5526229
Change-Id: I07fc88a342c3c6d1594832d0a05dd0734eb48424
Paul Stewart [Wed, 20 Jul 2016 00:17:47 +0000 (00:17 +0000)]
Fix string equality comparison
am:
1033c6fdbc
Change-Id: I6503cb15fdc0741b6c6c2da9ee14057265f87545
Paul Stewart [Wed, 20 Jul 2016 00:17:43 +0000 (00:17 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString
am:
cc00f4d646
Change-Id: Iece2fd19363a3524746b01cf388566363d678431
Paul Stewart [Tue, 19 Jul 2016 23:58:59 +0000 (23:58 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev
* changes:
Fix string equality comparison
WifiEnterpriseConfiguration: Do not print credentials in toString
Stephen Hines [Tue, 19 Jul 2016 23:52:00 +0000 (23:52 +0000)]
Merge \\"Disable warning triggered in Clang r271374\\" am:
bba87840d3
am:
4643acaa34
Change-Id: Ie8f5bcee02f0235d06f7b0f5b11efd592026fce1
Mark Lu [Tue, 19 Jul 2016 23:05:46 +0000 (16:05 -0700)]
docs: fixed '@' signs that were escaped improperly
Bug:
29824906
Change-Id: Ibbf3e57e3f36cb0fa5cba0119ad30ca95850f2e9
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:41:20 +0000 (23:41 +0000)]
Merge \"Disable warning triggered in Clang r271374\"
am:
bba87840d3
Change-Id: I03686c2e9c341d927b295c150aea8eea37f69338
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Disable warning triggered in Clang r271374"
sreevanis [Tue, 19 Jul 2016 21:21:23 +0000 (21:21 +0000)]
Merge \"docs: Added two new logos to Auto index page. Merge commit \'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\' into manual_merge_b94941d\" into nyc-dev
am:
86e39225a9
Change-Id: I204bdc1625d5ee66fabe5a17a551a645f1348506
Sreevani Sreejith [Tue, 19 Jul 2016 21:13:00 +0000 (21:13 +0000)]
Merge "docs: Added two new logos to Auto index page. Merge commit '
b94941d03ee77ed6c0e842683ec8bf5d420298d7' into manual_merge_b94941d" into nyc-dev
Amanda Kassay [Tue, 19 Jul 2016 20:49:01 +0000 (16:49 -0400)]
Adding projec.yaml files to all top/sub categories.
Change-Id: I8ac3a958852071da46fa08178ca3a74b103e48df
Jason Monk [Tue, 19 Jul 2016 20:37:28 +0000 (20:37 +0000)]
Merge \"Don\'t allow enable/disable of tuner on lockscreen\" into nyc-dev
am:
8933c41b35
Change-Id: I906016249dfb4667bfcaafde07900eee1d90570b
Jason Monk [Tue, 19 Jul 2016 20:37:17 +0000 (20:37 +0000)]
Merge \"Pre-setup restrictions\" into nyc-dev
am:
f84c05c360
Change-Id: I116aae1bf052d14e69204ee60c7d65837d5c7590
sreevanis [Tue, 19 Jul 2016 20:32:30 +0000 (13:32 -0700)]
docs: Added two new logos to Auto index page.
Merge commit '
b94941d03ee77ed6c0e842683ec8bf5d420298d7' into manual_merge_b94941d
Bug:
29625414
Change-Id: Iab1b6d2cdf29fd45fae953626271efc2c4d5635d
Pirama Arumuga Nainar [Wed, 29 Jun 2016 05:09:50 +0000 (22:09 -0700)]
Disable warning triggered in Clang r271374
http://b/
28149048
http://b/
29823425
Disable -Wconstant-conversion that gets triggered in
native/imageproc/to_rgba.c.
Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.
Change-Id: Ia8dbe49a1a8577599244642cbd2e3bb17ec1f83c
Jason Monk [Tue, 19 Jul 2016 20:31:21 +0000 (20:31 +0000)]
Merge "Don't allow enable/disable of tuner on lockscreen" into nyc-dev
Jason Monk [Tue, 19 Jul 2016 20:31:17 +0000 (20:31 +0000)]
Merge "Pre-setup restrictions" into nyc-dev
Christopher Ferris [Mon, 18 Jul 2016 23:58:52 +0000 (16:58 -0700)]
Remove dependency on android_alarm.h.
android_alarm.h no longer exists in upstream android kernels. Since it's
only used by the AlarmManagerService, copy in the parts of the file that
are needed into that one file.
Bug:
30072483
Change-Id: I5c994dfa2ad261da48a67e5c35dc4b6618b82aa1
Eric Schmidt [Tue, 19 Jul 2016 19:03:16 +0000 (19:03 +0000)]
Merge \"docs: Added call to build to code snippet\" into nyc-dev
am:
581815c652
Change-Id: Ic344ede7dafc95ab78e29724e1e6cc58115acc7c
Eric Schmidt [Tue, 19 Jul 2016 18:56:09 +0000 (18:56 +0000)]
Merge "docs: Added call to build to code snippet" into nyc-dev
Andrew Solovay [Tue, 19 Jul 2016 18:38:55 +0000 (18:38 +0000)]
Merge \"docs: Late-breaking Behavior Changes addition for N Preview 5\" into nyc-dev
am:
34d488b831
Change-Id: I25e914798ce778556fad4f2d0c97cb7175111892
Andrew Solovay [Tue, 19 Jul 2016 18:34:13 +0000 (18:34 +0000)]
Merge "docs: Late-breaking Behavior Changes addition for N Preview 5" into nyc-dev
Kevin Hufnagle [Tue, 19 Jul 2016 17:53:25 +0000 (17:53 +0000)]
Merge \"docs: Updated images and content on \"Google Sign-In\" page.\" into nyc-dev
am:
c13b84d38c
Change-Id: I61037c2a2aeb7def57d3280555bda39b1d7bb223
Kevin Hufnagle [Tue, 19 Jul 2016 17:41:51 +0000 (17:41 +0000)]
Merge "docs: Updated images and content on "Google Sign-In" page." into nyc-dev
sreevanis [Tue, 19 Jul 2016 17:21:55 +0000 (17:21 +0000)]
docs: Added two new logos to Auto index page. borgward and lada logos.
am:
f8710dd62f
Change-Id: I93ff55c7fce479be8d67d726b004ac9a5bc964e7
sreevanis [Mon, 18 Jul 2016 19:46:59 +0000 (12:46 -0700)]
docs: Added two new logos to Auto index page.
borgward and lada logos.
Bug:
29625414
Change-Id: Idc2e78ad4d3ddab3ce4af9bd903264c9ba8a7664
Jason Monk [Tue, 19 Jul 2016 16:39:58 +0000 (12:39 -0400)]
Don't allow enable/disable of tuner on lockscreen
Change-Id: Id9748ea39a8fa03b67d3fa6f91da530dd5cf9409
Fixes:
30107438
Kevin Hufnagle [Fri, 1 Jul 2016 00:22:35 +0000 (17:22 -0700)]
docs: Updated images and content on "Google Sign-In" page.
Removed 3 outdated images and replaced with a banner image. Also
updated content layout to fill the page appropriately given new
(single) image.
Bug:
26243119
Change-Id: I4bd71e2a22175ad8fe3bf592e80ff558877f0b11
Kevin Hufnagle [Tue, 19 Jul 2016 03:13:27 +0000 (03:13 +0000)]
Merge \"docs: Added metadata to display AdMob Udacity resource card\" into nyc-dev
am:
b79aac7a0e
Change-Id: If2e96ea7656a43a2f568f599378d1ae74fb25f0a
Kevin Hufnagle [Tue, 19 Jul 2016 03:13:18 +0000 (03:13 +0000)]
Merge \"docs: Edited phrasing for \"orderId is blank with test IAP purchases\"\" into nyc-dev
am:
e25fd0eda8
Change-Id: Ia4152d80b5701c5108aec6f399d4d97a3ef98473
Kevin Hufnagle [Tue, 19 Jul 2016 03:05:35 +0000 (03:05 +0000)]
Merge "docs: Added metadata to display AdMob Udacity resource card" into nyc-dev
Kevin Hufnagle [Tue, 19 Jul 2016 03:05:08 +0000 (03:05 +0000)]
Merge "docs: Edited phrasing for "orderId is blank with test IAP purchases"" into nyc-dev
Sungsoo Lim [Tue, 19 Jul 2016 01:46:43 +0000 (01:46 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
8dbf0b5558 am:
3c979c6aa6 am:
710605dccf -s ours am:
3900104379 -s ours am:
6e0cedcaf6 am:
aa0ad336b6 am:
407bb6ad53 -s ours am:
3e4c8a96fa am:
a1f106b558 am:
9e48fa5de1 am:
249acab988 -s ours
am:
aa93e8571f
Change-Id: I03c704e599fa56ee2555386af36dfb8be38f74c5
Sungsoo Lim [Tue, 19 Jul 2016 01:41:08 +0000 (01:41 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
8dbf0b5558 am:
3c979c6aa6 am:
710605dccf -s ours am:
3900104379 -s ours am:
6e0cedcaf6 am:
aa0ad336b6 am:
407bb6ad53 -s ours am:
3e4c8a96fa am:
a1f106b558 am:
9e48fa5de1
am:
249acab988 -s ours
Change-Id: Ia722ab69188cbf569a67c97d340da8634c2f7f7f
Sungsoo Lim [Tue, 19 Jul 2016 01:35:26 +0000 (01:35 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
8dbf0b5558 am:
3c979c6aa6 am:
710605dccf -s ours am:
3900104379 -s ours am:
6e0cedcaf6 am:
aa0ad336b6 am:
407bb6ad53 -s ours am:
3e4c8a96fa am:
a1f106b558
am:
9e48fa5de1
Change-Id: I2e278c6a3cf3763520321253751fc55ba3026d59
Sungsoo Lim [Tue, 19 Jul 2016 01:34:09 +0000 (01:34 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours am:
1ae841f508 am:
82a7ad2b09 am:
4e192f9a04 -s ours am:
d1b350ce7d am:
d8f381af5a am:
e863a0c868 am:
16b9011dd5 -s ours
am:
f5cddc7ef6
Change-Id: I8282937536d811d7d8728bca5649496d83a7867f
Sungsoo Lim [Tue, 19 Jul 2016 01:28:08 +0000 (01:28 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours am:
1ae841f508 am:
82a7ad2b09 am:
4e192f9a04 -s ours am:
d1b350ce7d am:
d8f381af5a am:
e863a0c868
am:
16b9011dd5 -s ours
Change-Id: I4814fcb307d5e577ed5b3ea3f66ab9949035e3ca
OSDN Git Service
