Raphael Moll
4a5687a714
Merge "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
2014-05-03 19:08:57 +00:00
Raphael Moll
4a747f67b0
win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.
...
This deactivate building all the exe binaries
and prevents atree from running (both for dev.git
and sdk.git). This still results in a win_sdk folder
so that the sdk_repo rule can work, but the generated
sdk will only contain linux binaries and is not to be
used for production, obviously.
Change-Id: I99cd27a050278afae3b62d1ef34a0a1a542bfd1a
2014-05-03 19:07:57 +00:00
Raphael Moll
df3914b04c
am 257a315e: am 304c8070: am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk"
...
* commit '257a315e72d8b878b71f1735c8174cfe69cde8c7':
Temporarily disable rs/bcc in win_sdk
2014-05-03 00:11:22 +00:00
Raphael Moll
257a315e72
am 304c8070: am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk"
...
* commit '304c80705867d34b3323350a2cf0412e2931f6d0':
Temporarily disable rs/bcc in win_sdk
2014-05-03 00:08:04 +00:00
Raphael Moll
304c807058
am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk"
...
* commit 'a783fe5f2c4e053b92b51ea1725fb535eaae7b0b':
Temporarily disable rs/bcc in win_sdk
2014-05-03 00:04:52 +00:00
Raphael Moll
a783fe5f2c
Merge "Temporarily disable rs/bcc in win_sdk"
2014-05-03 00:02:13 +00:00
Yigit Boyar
4718dfa473
am 864b97ae: am 6001125a: Merge "Updated recycler view demo with smooth scrolling" into klp-modular-dev
...
* commit '864b97ae3acf87af51bc9048fc120fbfbc33dfdb':
Updated recycler view demo with smooth scrolling
2014-05-02 22:18:04 +00:00
Deepanshu Gupta
adc0e01e6b
am 5bdd63dd: (-s ours) am c86e4941: am 11ea1bd2: am 99d404c4: am 9761e9c2: (-s ours) am 1f492924: am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '5bdd63ddf92b610f5133ac67d1bd40b731cd6502':
2014-05-02 22:15:19 +00:00
Deepanshu Gupta
b74ba373a0
am e08df140: (-s ours) am 81ccba52: am 059aa956: am 11ca5f1e: am 5f00e195: (-s ours) am 48ed332b: am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'e08df1400d532ba886f30ef538f09790fd5e792c':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 22:15:18 +00:00
Yigit Boyar
864b97ae3a
am 6001125a: Merge "Updated recycler view demo with smooth scrolling" into klp-modular-dev
...
* commit '6001125a83ec72cbeec33cd3cc4e32089823a3d2':
Updated recycler view demo with smooth scrolling
2014-05-02 20:20:50 +00:00
Yigit Boyar
6001125a83
Merge "Updated recycler view demo with smooth scrolling" into klp-modular-dev
2014-05-02 20:18:32 +00:00
Yigit Boyar
c270d6d8ba
Updated recycler view demo with smooth scrolling
...
Change-Id: I039d10a0e707e05dd4c5ce37344f4ecc80d00880
2014-05-02 13:08:21 -07:00
Deepanshu Gupta
5bdd63ddf9
am c86e4941: am 11ea1bd2: am 99d404c4: am 9761e9c2: (-s ours) am 1f492924: am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'c86e49418ba484e07a617d94fd2a34fb40f7cdf5':
2014-05-02 19:36:24 +00:00
Deepanshu Gupta
e08df1400d
am 81ccba52: am 059aa956: am 11ca5f1e: am 5f00e195: (-s ours) am 48ed332b: am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '81ccba52b314f2e14d5e92f297811b61c39ebc9d':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:36:23 +00:00
Deepanshu Gupta
c86e49418b
am 11ea1bd2: am 99d404c4: am 9761e9c2: (-s ours) am 1f492924: am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '11ea1bd25231dc96e54df9952784e281ae1e5c5a':
2014-05-02 19:34:04 +00:00
Deepanshu Gupta
81ccba52b3
am 059aa956: am 11ca5f1e: am 5f00e195: (-s ours) am 48ed332b: am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '059aa956e08bbe60dcea9cdf46d80c9fced56302':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:34:03 +00:00
Deepanshu Gupta
11ea1bd252
am 99d404c4: am 9761e9c2: (-s ours) am 1f492924: am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '99d404c430faab9a9343cbcc274c6e7cf7bfdbea':
2014-05-02 19:30:45 +00:00
Deepanshu Gupta
059aa956e0
am 11ca5f1e: am 5f00e195: (-s ours) am 48ed332b: am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '11ca5f1e66a0935b6dc3ff53f2007b5a9d4d4e56':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:30:44 +00:00
Deepanshu Gupta
99d404c430
am 9761e9c2: (-s ours) am 1f492924: am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '9761e9c2ad72950fbcfd9331d2226352212f8f85':
2014-05-02 19:28:46 +00:00
Deepanshu Gupta
9761e9c2ad
am 1f492924: am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '1f492924c4353ddd8fcdcf700b103f7e59c43bac':
2014-05-02 19:26:47 +00:00
Deepanshu Gupta
11ca5f1e66
am 5f00e195: (-s ours) am 48ed332b: am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '5f00e19500e78b9da9bba2889c53a0ec9f144133':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:25:08 +00:00
Deepanshu Gupta
1f492924c4
am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '40cab5153e4ab36f70096bba7ff7a60fd40d4ed3':
2014-05-02 19:24:01 +00:00
Deepanshu Gupta
5f00e19500
am 48ed332b: am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '48ed332b5aff2b4dbd472bb8c1f44dfb949ced77':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:23:11 +00:00
Raphael Moll
c63c2d31ba
Temporarily disable rs/bcc in win_sdk
...
Change-Id: Ic3c49f14098662c83167151a2abc7f46d847c67f
2014-05-02 12:21:17 -07:00
Deepanshu Gupta
48ed332b5a
am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'b866a59170206edc25f33dca28ee7f037050cc7f':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:20:09 +00:00
Deepanshu Gupta
40cab5153e
am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '5a65a7ab1359a809516d0a93a273b1fe5944858d':
2014-05-02 19:19:54 +00:00
Deepanshu Gupta
b866a59170
am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'b73c7b1244f8de87ee0f38308266508790e3eca5':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:16:20 +00:00
Deepanshu Gupta
5a65a7ab13
am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '2613ee50778d138973c0df75b054b19bbee874be':
2014-05-02 19:16:05 +00:00
Deepanshu Gupta
b73c7b1244
am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'c0e290d39f8ae6d9d41b869001cb4390d8037df4':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:12:36 +00:00
Deepanshu Gupta
2613ee5077
am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '19e61e5f528ade77831a7e3307cf213fc111341f':
2014-05-02 19:12:22 +00:00
Deepanshu Gupta
c0e290d39f
am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'a5d913ab3789e552bdfcc0a2a6b9fb87d6f1b0ca':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:09:00 +00:00
Deepanshu Gupta
19e61e5f52
am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'a5d913ab3789e552bdfcc0a2a6b9fb87d6f1b0ca':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:08:45 +00:00
Deepanshu Gupta
a5d913ab37
Add ICU jar to SDK [DO NOT MERGE]
...
Bundle the ICU jar with the SDK.
Change-Id: I0773cee58b072f3bf60c2594b6dee251ef101cf0
(cherry picked from commit 79cc4f9212
2014-05-02 11:59:11 -07:00
Vince Harron
e8ab84bbfb
am ab7ab626: am caa62895: am 611cfde5: Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
...
* commit 'ab7ab6260d509387db93f88b505c1976a7e0b5ad':
Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
2014-05-01 17:56:36 +00:00
Vince Harron
ab7ab6260d
am caa62895: am 611cfde5: Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
...
* commit 'caa62895daa96952010e0a610ebb334042dc0f0f':
Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
2014-05-01 17:51:15 +00:00
Vince Harron
caa62895da
am 611cfde5: Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
...
* commit '611cfde5c024add8345c4dd8cc9ab41b1f363905':
Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
2014-05-01 17:47:15 +00:00
Andrew Hsieh
1b10ec4818
am fc30ef32: am 4d8f4793: am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN"
...
* commit 'fc30ef32c781970fc05b3753152cee459c51ce0e':
Track transition from SIGRTMIN to __SIGRTMIN
2014-05-01 01:28:41 +00:00
Andrew Hsieh
fc30ef32c7
am 4d8f4793: am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN"
...
* commit '4d8f4793cdc9804e582805a22cfcd94343f8d9cc':
Track transition from SIGRTMIN to __SIGRTMIN
2014-05-01 01:24:57 +00:00
Andrew Hsieh
4d8f4793cd
am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN"
...
* commit '261d178e55db870331bd5eb8a41a22aa8f6c3589':
Track transition from SIGRTMIN to __SIGRTMIN
2014-05-01 01:22:48 +00:00
Andrew Hsieh
261d178e55
Merge "Track transition from SIGRTMIN to __SIGRTMIN"
2014-05-01 01:20:04 +00:00
Brian Carlstrom
fb9c4e0c9f
Track transition from SIGRTMIN to __SIGRTMIN
...
Change-Id: I69064edf1a7e95c91f90d9b05c1cf3f9c8c46747
2014-04-30 17:58:41 -07:00
Dave Platt
1dd16c67e9
Merge "Update sample NSD app to work reliably with current Android"
2014-04-30 23:39:27 +00:00
Tim Kilbourn
d810db8136
Merge "Set row heights for browse rows."
2014-04-30 19:23:06 +00:00
Chiao Cheng
e2962681b6
Merge "Overhaul of intellij-gen script."
2014-04-30 18:07:29 +00:00
Tim Kilbourn
6044578753
Set row heights for browse rows.
...
Set a size on the text_bg so the cards appear at the correct size.
Change-Id: Ic2a836431485aaaea922a6bb3868e3e937f1ec21
2014-04-30 09:42:26 -07:00
Bill Yi
9dc9ca97a5
am b5255dab: am 23f68632: Merge commit \'d297be2136209cab4edbcf8879520f65fb564103\' into HEAD
...
* commit 'b5255dabc0131f907c607a79f08c8bc9ea92551f':
2014-04-30 00:53:04 +00:00
Bill Yi
b5255dabc0
am 23f68632: Merge commit \'d297be2136209cab4edbcf8879520f65fb564103\' into HEAD
...
* commit '23f68632c7f1a368bcc471b9b782f29fb32619ca':
2014-04-30 00:49:29 +00:00
George Mount
69ac8ef1c4
Add new sample transition XML.
...
Change-Id: Iab0dc6f1533a2d841ff3edbda24535ba17184c7c
2014-04-29 13:46:56 -07:00
Bill Yi
23f68632c7
Merge commit 'd297be2136209cab4edbcf8879520f65fb564103' into HEAD
2014-04-29 11:33:09 -07:00
Tim Kilbourn
04c85ceee7
Minor card tweaks for leanback demo.
...
- Set card size to 160x100
- Show 10 rows
Change-Id: I440eef119250d3385ce5d367ec231bfe7c0201b4
2014-04-28 15:23:48 -07:00
