Ying Wang
88a13aae2f
Fix build.
...
Change-Id: I9a19516c637aff55a133d0a6a98f4ee140001ea1
2014-06-14 10:21:46 -07:00
Elliott Hughes
c3512210a5
am 3f5337f9: am 1b0d9bf1: am 8b1c1b30: Merge "Updating stack_core.py to recognize new ABI output from debuggerd."
...
* commit '3f5337f9e6b5c3ec3442d7b6c0e839264084f62f':
Updating stack_core.py to recognize new ABI output from debuggerd.
2014-06-14 01:17:37 +00:00
Elliott Hughes
3f5337f9e6
am 1b0d9bf1: am 8b1c1b30: Merge "Updating stack_core.py to recognize new ABI output from debuggerd."
...
* commit '1b0d9bf1333e8c2e77d4c3b5ab45aa35f3fccf17':
Updating stack_core.py to recognize new ABI output from debuggerd.
2014-06-14 00:53:06 +00:00
Elliott Hughes
1b0d9bf133
am 8b1c1b30: Merge "Updating stack_core.py to recognize new ABI output from debuggerd."
...
* commit '8b1c1b304203544bed76786064d685ec06e95593':
Updating stack_core.py to recognize new ABI output from debuggerd.
2014-06-14 00:48:59 +00:00
Andrew Hsieh
65681c0c81
am dfed70ac: am 2a97fd08: am e577c6b4: Merge "Fix ssize_t, WCHAR_MIN and WCHAR_MAX"
...
* commit 'dfed70acffff17b7116fa01e08c691dd565c4f72':
Fix ssize_t, WCHAR_MIN and WCHAR_MAX
2014-06-13 21:50:47 +00:00
Elliott Hughes
8b1c1b3042
Merge "Updating stack_core.py to recognize new ABI output from debuggerd."
2014-06-13 21:10:05 +00:00
Brigid Smith
45a46c6138
Updating stack_core.py to recognize new ABI output from debuggerd.
...
Change-Id: Ib9736a0509edb97be15f5e89dbc3a5188e744416
2014-06-13 17:43:38 -07:00
Andrew Hsieh
68134c8816
am bd92c406: am 31a7026b: am 724e3468: Merge "Update libm_hard.a"
...
* commit 'bd92c406a5da769a9b6eb71e6486b472176d2b6c':
Update libm_hard.a
2014-06-13 20:54:35 +00:00
Andrew Hsieh
dfed70acff
am 2a97fd08: am e577c6b4: Merge "Fix ssize_t, WCHAR_MIN and WCHAR_MAX"
...
* commit '2a97fd08a772d93b3354eebb1281b8a708d31a17':
Fix ssize_t, WCHAR_MIN and WCHAR_MAX
2014-06-13 19:09:31 +00:00
Andrew Hsieh
2a97fd08a7
am e577c6b4: Merge "Fix ssize_t, WCHAR_MIN and WCHAR_MAX"
...
* commit 'e577c6b4e3fbc35768f400b40951f43e88a61033':
Fix ssize_t, WCHAR_MIN and WCHAR_MAX
2014-06-13 19:05:27 +00:00
Andrew Hsieh
bd92c406a5
am 31a7026b: am 724e3468: Merge "Update libm_hard.a"
...
* commit '31a7026b66877c1166fb7d6e77ad17367e5698e3':
Update libm_hard.a
2014-06-13 16:35:44 +00:00
Andrew Hsieh
31a7026b66
am 724e3468: Merge "Update libm_hard.a"
...
* commit '724e34687c3cf77946fe94c7e655e7ab5e0f7124':
Update libm_hard.a
2014-06-13 16:32:37 +00:00
smain@google.com
2274fcaa08
am f60cdb2e: add redirects for new sdk workflow organization as per: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741
...
* commit 'f60cdb2e50c3cfbee3d9d3cef2dd67aa72d150b5':
add redirects for new sdk workflow organization as per: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741
2014-06-12 19:04:37 +00:00
Dmitry Shmidt
27f3f5fab1
Merge "Connectivity: Add current scan amount notification"
2014-06-12 17:09:07 +00:00
Dmitry Shmidt
4bef5c56f8
Connectivity: Add current scan amount notification
...
Change-Id: I717926f804d7e13192b80e59019310dc63cc0df8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com >
2014-06-12 13:47:34 -07:00
Jae Seo
5ddaa90c1a
Merge "Apply the latest changes in TV framework for AtscTvInput"
2014-06-12 17:09:07 +00:00
Alan Viverette
a9cb62536b
Add navigation list to API Demos
...
Change-Id: Ib18bb6ce41b27049273add697a65c607442ee13f
2014-06-12 18:13:42 -07:00
Yigit Boyar
3d49877e6e
Merge "Remove calls to LM.getItemCount in demos."
2014-06-12 17:09:07 +00:00
Yigit Boyar
c77710e3eb
Remove calls to LM.getItemCount in demos.
...
Bug: 15410611
Change-Id: Ie31616f792501f29fbb9e68f742563fbb1cde0ca
2014-06-12 15:58:16 -07:00
Deepanshu Gupta
9e66bc405f
am f7449cdb: Merge "Package renamed fonts again." into lmp-preview-dev
...
* commit 'f7449cdb18aeef440c8b1e2d7e99ec9970fc7f8a':
Package renamed fonts again.
2014-06-12 16:54:21 +00:00
Jaewan Kim
7cf897a71b
Apply the latest changes in TV framework for AtscTvInput
...
Bug: 15578871
Change-Id: Ia268b239510cf216ddf0f1bdce63f6c7f5bf3bdf
2014-06-12 19:42:09 +09:00
smain@google.com
f60cdb2e50
add redirects for new sdk workflow organization
...
as per: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741
Change-Id: Id47ba34ab99cdc6aa494e9b54f69066670f9e570
2014-06-11 20:34:09 -07:00
Andrew Hsieh
724e34687c
Merge "Update libm_hard.a"
2014-06-12 03:32:07 +00:00
Alan Viverette
37cac69057
Merge "Add list navigation to API Demos"
2014-06-12 03:30:50 +00:00
Chris Banes
e37f6aacf4
am e6174a6e: (-s ours) Merge "DO NOT MERGE Add android-support-v7-palette to build" into lmp-preview-dev
...
* commit 'e6174a6e974ba01e17c9f7b1037a5fe389b0243a':
DO NOT MERGE Add android-support-v7-palette to build
2014-06-12 20:05:43 +00:00
Yigit Boyar
cf4ea785a7
am 6f28e3a9: (-s ours) Merge "DO NOT MERGE Disable predictive animations in RecyclerView demo" into lmp-preview-dev
...
* commit '6f28e3a933c08f79a14083eeafd2b7e470764812':
DO NOT MERGE Disable predictive animations in RecyclerView demo
2014-06-12 19:56:49 +00:00
Robert Greenwalt
ab7c289d25
am 410bcade: Merge "Use the updated RouteInfo API." into lmp-preview-dev
...
* commit '410bcade765d12d822b54dee4bd74840d396d581':
Use the updated RouteInfo API.
2014-06-12 19:56:46 +00:00
Alan Viverette
6fcf326d1a
Add list navigation to API Demos
...
BUG: 15566102
Change-Id: I4c1dd13d5ac5502d6d3f879ce916b09d81338940
2014-06-12 12:56:36 -07:00
smain@google.com
2b6347e144
am 2274fcaa: am f60cdb2e: add redirects for new sdk workflow organization as per: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741
...
* commit '2274fcaa0824a521d6d14dc2f2669b48a0c16332':
add redirects for new sdk workflow organization as per: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741
2014-06-12 19:23:51 +00:00
Robert Greenwalt
410bcade76
Merge "Use the updated RouteInfo API." into lmp-preview-dev
2014-06-11 23:10:23 +00:00
Glenn Kasten
f59aa1d223
Merge "Update OpenSLES_Android.h for API 20"
2014-06-11 21:23:31 +00:00
Yigit Boyar
6f28e3a933
Merge "DO NOT MERGE Disable predictive animations in RecyclerView demo" into lmp-preview-dev
2014-06-11 21:23:31 +00:00
Yigit Boyar
365d701866
DO NOT MERGE Disable predictive animations in RecyclerView demo
...
Change-Id: I3b8ea3896866e389ccae2db32b1828194b8acf25
2014-06-11 23:41:50 +00:00
Raphael Moll
b4654552c5
am bbd9b96c: am 8235126e: am 9649c415: Merge "Change api-versions.xml generator source order."
...
* commit 'bbd9b96cd10864554c5f3f9ab5e0e1bbf43442b6':
Change api-versions.xml generator source order.
2014-06-11 20:24:31 +00:00
Ying Wang
3016ff6d0a
am c8ed8c25: am bcfa67e5: am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"
...
* commit 'c8ed8c25bc796cd82fb1df0ea100e320a542eeb3':
Switch to SDK_HOST_ARCH
2014-06-11 19:26:28 +00:00
Andrew Hsieh
95a6cb0724
am e233c416: am 86509e1d: am 0e85aa03: Merge "Add missing mips64 lib-bootstrap"
...
* commit 'e233c416944455f9ecf00900fb5f5e1075d407f5':
Add missing mips64 lib-bootstrap
2014-06-11 18:37:19 +00:00
Raphael Moll
b6fbb4d0c9
am 9cec99d9: am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint."
...
* commit '9cec99d9540822e68559e25b471bbe788352839d':
Generate api-versions.xml for lint.
2014-06-11 18:18:59 +00:00
Elliott Hughes
fe134ceca3
am fc800c1d: am 877b9486: am 815d7a7d: Merge "Fix build by removing libportable from the default build."
...
* commit 'fc800c1dba34a8da105e18242257af56fa2ac754':
Fix build by removing libportable from the default build.
2014-06-11 17:44:57 +00:00
Chris Banes
e6174a6e97
Merge "DO NOT MERGE Add android-support-v7-palette to build" into lmp-preview-dev
2014-06-11 15:57:38 +00:00
Chet Haase
5dc15512b8
am 2d719d6c: AnimatedRecyclerActivity demo supports simpler RV item animations
...
* commit '2d719d6c716e4b800c9b9bcd31fe36fdddb8adfd':
AnimatedRecyclerActivity demo supports simpler RV item animations
2014-06-11 12:41:38 +00:00
Sreeram Ramachandran
ef57b53c63
Use the updated RouteInfo API.
...
Bug: 15142362
Bug: 13885501
Change-Id: I97f1625e037c889b0cddd3db418c42c1d48b26b9
(cherry picked from commit 732d646f51 )
2014-06-10 22:28:51 +00:00
Deepanshu Gupta
f7449cdb18
Merge "Package renamed fonts again." into lmp-preview-dev
2014-06-10 22:12:51 +00:00
Deepanshu Gupta
4100ca144d
Package renamed fonts again.
...
PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.
Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
2014-06-10 18:42:40 -07:00
Sreeram Ramachandran
6618e52d97
Merge "Use the updated RouteInfo API."
2014-06-10 21:59:55 +00:00
Andrew Hsieh
e577c6b4e3
Merge "Fix ssize_t, WCHAR_MIN and WCHAR_MAX"
2014-06-10 21:55:12 +00:00
Raphael Moll
bbd9b96cd1
am 8235126e: am 9649c415: Merge "Change api-versions.xml generator source order."
...
* commit '8235126ebf42ddd9dd1e9d8191be67ae46cb54ae':
Change api-versions.xml generator source order.
2014-06-10 21:12:13 +00:00
Raphael Moll
8235126ebf
am 9649c415: Merge "Change api-versions.xml generator source order."
...
* commit '9649c415e7e959b67a8810cd17ab65b7994c0f71':
Change api-versions.xml generator source order.
2014-06-10 21:08:36 +00:00
Raphael Moll
9649c415e7
Merge "Change api-versions.xml generator source order."
2014-06-10 21:00:58 +00:00
Chet Haase
2d719d6c71
AnimatedRecyclerActivity demo supports simpler RV item animations
...
Add logic to AnimatedRecyclerActivity to allow it to opt into, or out of,
predictive item animations in RecyclerView.
Issue #15542012 Simplify RecyclerView animations
Change-Id: Ibb089a98c4d465730cfbff2a9dec369e28feff82
2014-06-10 12:35:41 -07:00
Jesse Hall
94bb931884
resolved conflicts for merge of 3e06bd39 to master
...
I'm not sure why git thought there was a conflict; it thought these
files had been deleted in master and renamed in lmp-preview-dev. In
reality, they've never existed anywhere, and were created in
lmp-preview-dev by the change being merged. Weird.
Conflicts:
ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.functions.txt
ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.functions.txt
ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.functions.txt
ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-mips64/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-x86/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-x86_64/symbols/libGLESv3.so.variables.txt
Change-Id: Ic7cc66f1fa053ff05d55911caad92dfd6669138d
2014-06-10 12:17:15 -07:00