Dan Albert
12b7d10cd4
Merge "Stop shadowing __pure2 in math.h." am: 5b7b38f62e am: 69ba57faf4
...
am: 787d406d8b
Change-Id: Iae3d7a85e33385b4cd53394262d40b8429ab24e3
2016-09-29 21:29:20 +00:00
Dan Albert
787d406d8b
Merge "Stop shadowing __pure2 in math.h." am: 5b7b38f62e
...
am: 69ba57faf4
Change-Id: Ib9d8012348acd10068511e7793105519c151823b
2016-09-29 21:16:34 +00:00
Dan Albert
69ba57faf4
Merge "Stop shadowing __pure2 in math.h."
...
am: 5b7b38f62e
Change-Id: I5a673130d72f91c5ff1a745bcb91ddab9e453000
2016-09-29 21:12:04 +00:00
Treehugger Robot
5b7b38f62e
Merge "Stop shadowing __pure2 in math.h."
2016-09-29 21:02:57 +00:00
Trevor Johns
36136e4a6f
Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4 am: bf0ff8fe8a am: c610246491 am: d3835b3f8b
...
am: d6325e28ca
Change-Id: Idccd2d4f65dd980bee2c9923f652bf2da421bb68
2016-09-29 18:31:41 +00:00
Trevor Johns
d26accdfec
Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4 am: bf0ff8fe8a
...
am: 9f7bceae20
Change-Id: Ib112fd519a74f64bc9b77da59a18a4027070c5de
2016-09-29 18:28:35 +00:00
Trevor Johns
d6325e28ca
Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4 am: bf0ff8fe8a am: c610246491
...
am: d3835b3f8b
Change-Id: I6346906a66ef41ba90dc3942bfa7cb25345fb135
2016-09-29 18:27:38 +00:00
Trevor Johns
d3835b3f8b
Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4 am: bf0ff8fe8a
...
am: c610246491
Change-Id: Ie7c474f75e7723b5acde7305f71800fcb87c796f
2016-09-29 18:23:40 +00:00
Trevor Johns
9f7bceae20
Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4
...
am: bf0ff8fe8a
Change-Id: I7a8a50b92ab5c50e6956aa03f424fa3a437afefe
2016-09-29 18:18:41 +00:00
Trevor Johns
c610246491
Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4
...
am: bf0ff8fe8a
Change-Id: I7b38c0562da06941a4011f66277ae7f56965c299
2016-09-29 18:18:40 +00:00
Trevor Johns
bf0ff8fe8a
Re-add WearNotifications sample to build/sdk.atree
...
am: ccc3c96cd4
Change-Id: I010be975d300af90436bae94393244c197b62b0f
2016-09-29 18:13:45 +00:00
Trevor Johns
ccc3c96cd4
Re-add WearNotifications sample to build/sdk.atree
...
Change-Id: I2af96ce2015d05bb189504d944b7dd7cdcf3c065
2016-09-29 17:54:00 +00:00
Dan Albert
17f4026295
Stop shadowing __pure2 in math.h.
...
I'd actually fixed sys/cdefs.h quite some time ago, but that
definition of __pure2 was being clobbered by the bogus one in math.h.
Test: clang -E -dM --sysroot $NDK/platforms/android-9/arch-arm/ \
platforms/android-9/include/math.h | grep __pure2
Bug: http://b.android.com/62020
Change-Id: I9b93a7c46075a02ed1ea0ca2cc77624b15955c7f
2016-09-29 10:09:36 -07:00
Trevor Johns
66d3ce7971
Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85" into nyc-docs am: dd604550be am: c6f2d3a7b4 am: c869b66d5e am: b169879ac7
...
am: 903251936d
Change-Id: I1fbe307b3bb91edd243747e0658da656730055da
2016-09-29 16:35:16 +00:00
Trevor Johns
e9ed80764b
Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85 am: 17f1bd13e0 am: 61a495323c am: 4adef0f229 am: 3cc20d4124
...
am: adad1fe47c
Change-Id: I01535cd1bf69b571393ecd9814d68fcd0345d163
2016-09-29 16:35:02 +00:00
Trevor Johns
a36a1ec8e3
Revert "Add WearNotifications sample to sdk.atree" am: e48244707b am: af01474428 am: 45fad88225 am: 2bc3a93371
...
am: eee3843716
Change-Id: I7ce4708f883e4bc5e97e38e10e321c2b0b3bab43
2016-09-29 16:34:48 +00:00
Trevor Johns
903251936d
Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85" into nyc-docs am: dd604550be am: c6f2d3a7b4 am: c869b66d5e
...
am: b169879ac7
Change-Id: Ie810e33419f592492d2462dbc5368e4b71ee5514
2016-09-29 16:30:44 +00:00
Trevor Johns
adad1fe47c
Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85 am: 17f1bd13e0 am: 61a495323c am: 4adef0f229
...
am: 3cc20d4124
Change-Id: I1a5408c290f226870a8ee5e746233851ca68a6d5
2016-09-29 16:30:30 +00:00
Trevor Johns
eee3843716
Revert "Add WearNotifications sample to sdk.atree" am: e48244707b am: af01474428 am: 45fad88225
...
am: 2bc3a93371
Change-Id: I9262156166438b103aa54240a9cc8e04d0b170b8
2016-09-29 16:30:17 +00:00
Trevor Johns
f5f48405b3
Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85" into nyc-docs am: dd604550be am: c6f2d3a7b4
...
am: 8ed88d980f
Change-Id: I7c84c3ec19bc29ed90ecb5e0405013a3783692cc
2016-09-29 16:25:46 +00:00
Trevor Johns
b169879ac7
Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85" into nyc-docs am: dd604550be am: c6f2d3a7b4
...
am: c869b66d5e
Change-Id: I17c6e90724d1025bcc731a67e54065bd0f674ae4
2016-09-29 16:25:42 +00:00
Trevor Johns
ee770fe27d
Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85 am: 17f1bd13e0 am: 61a495323c
...
am: 4ce780da53
Change-Id: I3ed07b1b4d6acc95f801ca4e46edc748b1b9ba7d
2016-09-29 16:25:32 +00:00
Trevor Johns
3cc20d4124
Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85 am: 17f1bd13e0 am: 61a495323c
...
am: 4adef0f229
Change-Id: I13412368d28e2fb87cf13bb949534565a6320942
2016-09-29 16:25:30 +00:00
Trevor Johns
bc6c39b340
Revert "Add WearNotifications sample to sdk.atree" am: e48244707b am: af01474428
...
am: b2ced86ed5
Change-Id: I94b896ecec79020587203173a00b3195e905a80f
2016-09-29 16:25:20 +00:00
Trevor Johns
2bc3a93371
Revert "Add WearNotifications sample to sdk.atree" am: e48244707b am: af01474428
...
am: 45fad88225
Change-Id: Id424778fa4c74566516998fd3c94b12bf3108cac
2016-09-29 16:25:17 +00:00
Trevor Johns
c869b66d5e
Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85" into nyc-docs am: dd604550be
...
am: c6f2d3a7b4
Change-Id: Ib0860fe5a4acff75b6c4d36d05162b14ec6b83aa
2016-09-29 16:21:19 +00:00
Trevor Johns
8ed88d980f
Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85" into nyc-docs am: dd604550be
...
am: c6f2d3a7b4
Change-Id: I45e018b7e0c0eb84176168e497989e3a8f3a8c49
2016-09-29 16:21:18 +00:00
Trevor Johns
4ce780da53
Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85 am: 17f1bd13e0
...
am: 61a495323c
Change-Id: I6278ab1372d368367b5891a193e5b057b8f330d0
2016-09-29 16:21:04 +00:00
Trevor Johns
4adef0f229
Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85 am: 17f1bd13e0
...
am: 61a495323c
Change-Id: I5397c07c3b69cdbc29c8c5fbc6183735fff60d0f
2016-09-29 16:21:04 +00:00
Trevor Johns
b2ced86ed5
Revert "Add WearNotifications sample to sdk.atree" am: e48244707b
...
am: af01474428
Change-Id: Idd6e0c61ae75e542411e9fbcb0a1173a26416eae
2016-09-29 16:20:50 +00:00
Trevor Johns
45fad88225
Revert "Add WearNotifications sample to sdk.atree" am: e48244707b
...
am: af01474428
Change-Id: Ic85dea9aaaf4a561b5b7976c5804988a8fcb86c2
2016-09-29 16:20:49 +00:00
Trevor Johns
c6f2d3a7b4
Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85" into nyc-docs
...
am: dd604550be
Change-Id: I1d314a556d57054b8ac1f15f50c7a07976bde8ff
2016-09-29 16:16:02 +00:00
Trevor Johns
61a495323c
Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85
...
am: 17f1bd13e0
Change-Id: I71b758ea775bd0ec4e228e103cf959ad492dcf4c
2016-09-29 16:16:01 +00:00
Trevor Johns
af01474428
Revert "Add WearNotifications sample to sdk.atree"
...
am: e48244707b
Change-Id: I9ef1118d010ffe92aa3c03089703b9e4d4520655
2016-09-29 16:15:46 +00:00
Android Build Merger (Role)
dd604550be
Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15 am: dfa6375f85" into nyc-docs
2016-09-29 16:10:56 +00:00
Trevor Johns
17f1bd13e0
Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15
...
am: dfa6375f85
Change-Id: Ie276238f23dbbb80fa8141a7bb0b4475d32d2fc5
2016-09-29 16:10:48 +00:00
Trevor Johns
e48244707b
Revert "Add WearNotifications sample to sdk.atree"
...
This reverts commit f765bdac59 .
Change-Id: I59294be08998e945eec99c549ac45a70feef0d04
(cherry picked from commit 8b0e298179 )
2016-09-29 16:09:44 +00:00
Trevor Johns
dfa6375f85
Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179
...
am: 70eaf3de15
Change-Id: I4e1e310a3f65fa7e7a9e02b8ac8b0674903b5054
2016-09-29 16:06:16 +00:00
Trevor Johns
70eaf3de15
Revert "Add WearNotifications sample to sdk.atree"
...
am: 8b0e298179
Change-Id: I5d1d11bbb43faf933bb3bb56a46986bdaa06b08d
2016-09-29 16:01:44 +00:00
Trevor Johns
8b0e298179
Revert "Add WearNotifications sample to sdk.atree"
...
This reverts commit f765bdac59 .
Change-Id: I59294be08998e945eec99c549ac45a70feef0d04
2016-09-29 15:54:56 +00:00
Trevor Johns
e8a4b204af
Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212 am: f48e6ce63a am: af4e7ac1f9 am: 55270a9ba5 am: a063b5a977
...
am: 31a96287f9
Change-Id: If522843e33c94053e571445e6a2b582cb28ad664
2016-09-29 06:26:12 +00:00
Trevor Johns
31a96287f9
Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212 am: f48e6ce63a am: af4e7ac1f9 am: 55270a9ba5
...
am: a063b5a977
Change-Id: I3763577db915154d1111baf8df74470467d685b1
2016-09-29 06:21:51 +00:00
Trevor Johns
46119e2a2a
Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212 am: f48e6ce63a am: af4e7ac1f9
...
am: b0e713bd13
Change-Id: Ia03906e68c80abb9267b99f6dbbb243de2dd323c
2016-09-29 06:21:43 +00:00
Trevor Johns
a063b5a977
Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212 am: f48e6ce63a am: af4e7ac1f9
...
am: 55270a9ba5
Change-Id: I441af3d86f7189d743af8c293b4d345a613413a2
2016-09-29 06:17:09 +00:00
Trevor Johns
b0e713bd13
Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212 am: f48e6ce63a
...
am: af4e7ac1f9
Change-Id: Ic8960fb3ff1647f5c8256a6a04df354a16221471
2016-09-29 06:13:10 +00:00
Trevor Johns
55270a9ba5
Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212 am: f48e6ce63a
...
am: af4e7ac1f9
Change-Id: I7a890eb2bad9abcee05c5cb54062d301d967a044
2016-09-29 06:13:10 +00:00
Trevor Johns
af4e7ac1f9
Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212
...
am: f48e6ce63a
Change-Id: I65d0e0937d80a297f5007fffd549428cae2014c6
2016-09-29 06:08:40 +00:00
Trevor Johns
f48e6ce63a
Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19
...
am: c407cfe212
Change-Id: Ib4fa3b88e0f7275ea7387e13a98725e0430fb5b8
2016-09-29 06:04:40 +00:00
Trevor Johns
c407cfe212
Add WearNotifications sample to sdk.atree am: f765bdac59
...
am: ae8eec3f19
Change-Id: Ib5ca39c7192e6c8eed61df113ffb61e501ccf15f
2016-09-29 05:59:38 +00:00
Trevor Johns
ae8eec3f19
Add WearNotifications sample to sdk.atree
...
am: f765bdac59
Change-Id: I9c2218617b10d4cb485f7bd108834a1391b54545
2016-09-29 05:55:37 +00:00