Paul Stewart
700c72d01d
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4
...
am: bf4f010a5b
2016-07-20 00:37:50 +00:00
Paul Stewart
e2a03026c4
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9
...
am: 141477b103
2016-07-20 00:37:44 +00:00
Paul Stewart
2e85e2ef26
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28
...
am: 58555ee891
2016-07-20 00:31:29 +00:00
Paul Stewart
bf4f010a5b
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf
...
am: 3fbe9280a4
2016-07-20 00:31:22 +00:00
Paul Stewart
141477b103
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6
...
am: df93deccf9
2016-07-20 00:31:15 +00:00
Paul Stewart
58555ee891
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229
...
am: 2169197e28
2016-07-20 00:25:20 +00:00
Paul Stewart
3fbe9280a4
Fix string equality comparison am: 1033c6fdbc
...
am: fdd4fe53cf
2016-07-20 00:25:17 +00:00
Paul Stewart
df93deccf9
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646
...
am: fa4bbf4ad6
2016-07-20 00:25:14 +00:00
Paul Stewart
2169197e28
Merge changes Id25696e4,I939a12a2 into klp-dev
...
am: 77b5526229
2016-07-20 00:17:49 +00:00
Paul Stewart
fdd4fe53cf
Fix string equality comparison
...
am: 1033c6fdbc
2016-07-20 00:17:47 +00:00
Paul Stewart
fa4bbf4ad6
WifiEnterpriseConfiguration: Do not print credentials in toString
...
am: cc00f4d646
2016-07-20 00:17:43 +00:00
Paul Stewart
77b5526229
Merge changes Id25696e4,I939a12a2 into klp-dev
...
* changes:
Fix string equality comparison
WifiEnterpriseConfiguration: Do not print credentials in toString
2016-07-19 23:59:00 +00:00
Stephen Hines
46b64ae00e
Merge \\"Disable warning triggered in Clang r271374\\" am: bba87840d3
...
am: 4643acaa34
2016-07-19 23:52:00 +00:00
Mark Lu
7e082bcbbf
docs: fixed '@' signs that were escaped improperly
...
Bug: 29824906
Change-Id: Ibbf3e57e3f36cb0fa5cba0119ad30ca95850f2e9
2016-07-19 16:43:34 -07:00
Pirama Arumuga Nainar
4643acaa34
Merge \"Disable warning triggered in Clang r271374\"
...
am: bba87840d3
2016-07-19 23:41:20 +00:00
Stephen Hines
bba87840d3
Merge "Disable warning triggered in Clang r271374"
2016-07-19 22:02:31 +00:00
sreevanis
b7e80ca81f
Merge \"docs: Added two new logos to Auto index page. Merge commit \'b94941d03ee77ed6c0e842683ec8bf5d420298d7\' into manual_merge_b94941d\" into nyc-dev
...
am: 86e39225a9
2016-07-19 21:21:23 +00:00
Sreevani Sreejith
86e39225a9
Merge "docs: Added two new logos to Auto index page. Merge commit 'b94941d03ee77ed6c0e842683ec8bf5d420298d7' into manual_merge_b94941d" into nyc-dev
2016-07-19 21:13:02 +00:00
Amanda Kassay
9504b4903a
Adding projec.yaml files to all top/sub categories.
...
Change-Id: I8ac3a958852071da46fa08178ca3a74b103e48df
2016-07-19 16:49:01 -04:00
Jason Monk
b9f06d829a
Merge \"Don\'t allow enable/disable of tuner on lockscreen\" into nyc-dev
...
am: 8933c41b35
2016-07-19 20:37:28 +00:00
Jason Monk
9220e9dec9
Merge \"Pre-setup restrictions\" into nyc-dev
...
am: f84c05c360
2016-07-19 20:37:17 +00:00
sreevanis
7f8391a66f
docs: Added two new logos to Auto index page.
...
Merge commit 'b94941d03ee77ed6c0e842683ec8bf5d420298d7' into manual_merge_b94941d
Bug:29625414
Change-Id: Iab1b6d2cdf29fd45fae953626271efc2c4d5635d
2016-07-19 13:32:30 -07:00
Pirama Arumuga Nainar
b6709700db
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
2016-07-19 20:31:39 +00:00
Jason Monk
8933c41b35
Merge "Don't allow enable/disable of tuner on lockscreen" into nyc-dev
2016-07-19 20:31:23 +00:00
Jason Monk
f84c05c360
Merge "Pre-setup restrictions" into nyc-dev
2016-07-19 20:31:19 +00:00
Christopher Ferris
338893e47e
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
2016-07-19 12:23:26 -07:00
Eric Schmidt
944572de1e
Merge \"docs: Added call to build to code snippet\" into nyc-dev
...
am: 581815c652
2016-07-19 19:03:16 +00:00
Eric Schmidt
581815c652
Merge "docs: Added call to build to code snippet" into nyc-dev
2016-07-19 18:56:10 +00:00
Andrew Solovay
626f9b0632
Merge \"docs: Late-breaking Behavior Changes addition for N Preview 5\" into nyc-dev
...
am: 34d488b831
2016-07-19 18:38:55 +00:00
Andrew Solovay
34d488b831
Merge "docs: Late-breaking Behavior Changes addition for N Preview 5" into nyc-dev
2016-07-19 18:34:15 +00:00
Kevin Hufnagle
6e3bbf06a0
Merge \"docs: Updated images and content on \"Google Sign-In\" page.\" into nyc-dev
...
am: c13b84d38c
2016-07-19 17:53:25 +00:00
sreevanis
a08e461c2f
docs: Fixed typo.
...
Bug:24735177
Change-Id: I08e5f54795e5d26e2207fb9feccc0f2eff96ed70
2016-07-19 10:43:05 -07:00
Kevin Hufnagle
c13b84d38c
Merge "docs: Updated images and content on "Google Sign-In" page." into nyc-dev
2016-07-19 17:41:52 +00:00
sreevanis
b94941d03e
docs: Added two new logos to Auto index page. borgward and lada logos.
...
am: f8710dd62f
2016-07-19 17:21:55 +00:00
sreevanis
f8710dd62f
docs: Added two new logos to Auto index page.
...
borgward and lada logos.
Bug:29625414
Change-Id: Idc2e78ad4d3ddab3ce4af9bd903264c9ba8a7664
2016-07-19 10:07:08 -07:00
Jason Monk
ee9fcf50be
Don't allow enable/disable of tuner on lockscreen
...
Change-Id: Id9748ea39a8fa03b67d3fa6f91da530dd5cf9409
Fixes: 30107438
2016-07-19 12:39:58 -04:00
Kevin Hufnagle
7d6efc8d36
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
2016-07-18 20:54:05 -07:00
Kevin Hufnagle
aa63aab59e
Merge \"docs: Added metadata to display AdMob Udacity resource card\" into nyc-dev
...
am: b79aac7a0e
2016-07-19 03:13:27 +00:00
Kevin Hufnagle
eb2835329f
Merge \"docs: Edited phrasing for \"orderId is blank with test IAP purchases\"\" into nyc-dev
...
am: e25fd0eda8
2016-07-19 03:13:18 +00:00
Kevin Hufnagle
b79aac7a0e
Merge "docs: Added metadata to display AdMob Udacity resource card" into nyc-dev
2016-07-19 03:05:36 +00:00
Kevin Hufnagle
e25fd0eda8
Merge "docs: Edited phrasing for "orderId is blank with test IAP purchases"" into nyc-dev
2016-07-19 03:05:09 +00:00
Sungsoo Lim
8617f22697
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
2016-07-19 01:46:43 +00:00
Sungsoo Lim
aa93e8571f
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
2016-07-19 01:41:08 +00:00
Sungsoo Lim
249acab988
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
2016-07-19 01:35:26 +00:00
Sungsoo Lim
b4f2154ee2
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
2016-07-19 01:34:09 +00:00
Alan Leung
402aee85a3
Fix thread priority after boosting.
...
The previous CL wrongly restores all priority to nice 0.
This CL changes two things:
1. It remembers and restores the previous priority.
2. If the thread has priority of < -2. Do not set it to -2.
BUG: 29930920
Change-Id: I927e060d789c9bbf92f6a166f44317d9db0f5205
(cherry picked from commit d6e67e6a16
2016-07-19 01:30:43 +00:00
Sungsoo Lim
f5cddc7ef6
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
2016-07-19 01:28:08 +00:00
Sungsoo Lim
d6c5a06460
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35 -s ours am: a2044118a5 am: e8a7640503 am: f98fcae527 am: 4f88587f65 -s ours
...
am: 3fc550a0e3
2016-07-19 01:26:29 +00:00
Sungsoo Lim
9e48fa5de1
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
2016-07-19 01:26:16 +00:00
Sungsoo Lim
3fc550a0e3
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35 -s ours am: a2044118a5 am: e8a7640503 am: f98fcae527
...
am: 4f88587f65
2016-07-19 01:19:16 +00:00
