Craig Stout
|
2eea41beea
|
am 196dc75f: am a38b253e: Merge "Add playback progress." into lmp-dev
* commit '196dc75f73fb9cd7cfcc136efa97f7c8af9a08c0':
|
2015-03-20 21:48:38 +00:00 |
|
Andrew Hsieh
|
efe7a324f4
|
am 4bfb4d31: am c59b1400: am 0efeb2c6: Merge "Fix the name of the native app glue lib in a header comment"
* commit '4bfb4d3100659dd51bd0d0779de3b2d5d1ee635b':
Fix the name of the native app glue lib in a header comment
|
2015-03-20 21:48:35 +00:00 |
|
Alan Lau
|
be5276ec9c
|
am b6759681: am afb9296e: am 050972b1: am 2d0d6541: Change setScrollVertically to protected to make scroll work in subclasses.
* commit 'b6759681230574590842edcf8445eec009f3f802':
|
2015-03-20 21:48:30 +00:00 |
|
Craig Stout
|
4dd6396ea3
|
am c375cc14: am fb9584cf: Merge "Add PlaybackOverlayFragment" into lmp-dev
* commit 'c375cc1485e42525f5d6a958b99e62cce5e51146':
|
2015-03-20 21:48:23 +00:00 |
|
Alan Viverette
|
6efccab7e9
|
am 095e3946: am 974dc59d: Update ApiDemos themes, remove targetSdkVersion
* commit '095e3946f0c525025e63e7d8f0bc0f409b1a1263':
|
2015-03-20 21:48:18 +00:00 |
|
Dake Gu
|
f60b059b5d
|
am dcf85159: am d54e6b19: SupportLeanbackDemo: activity transition
* commit 'dcf85159fed7e7cfc99bc854ac193b393cf64abb':
|
2015-03-20 21:48:12 +00:00 |
|
Griff Hazen
|
76a5a07ab4
|
am 4be1723b: am 3815535c: am 1fd1d233: (-s ours) am 7003893f: DO NOT MERGE Update version of sdk 20 samples to 2
* commit '4be1723bf3715569b97764e0003fd022367a6725':
|
2015-03-20 21:48:04 +00:00 |
|
Jean-Luc Brouillet
|
ca34f82c99
|
am 62e0ab89: am 58668fc5: Merge "Fix directory where CtsTestStubs.apk is found." into lmp-dev
* commit '62e0ab8946f85fba197518771c9fa7b1d8951306':
|
2015-03-20 21:47:57 +00:00 |
|
Ying Wang
|
eddca2e9d5
|
am 99d2b20c: am 06a0ec0b: new installation path of apks.
* commit '99d2b20cc6b94dfd8584a4007a0b3fbfe78316e0':
|
2015-03-20 21:47:51 +00:00 |
|
Chulwoo Lee
|
d740ddd082
|
am c7269687: am 9f688cc1: Merge "Put input ID when inserting channels" into lmp-dev
* commit 'c72696874638bbc9d0be5adc47201b59c4625588':
|
2015-03-20 21:47:49 +00:00 |
|
Andrew Hsieh
|
ce3a6697bb
|
am 5f34909a: am 093774e6: am b50f8f66: Merge "Add APP_ABI for module-exports sample"
* commit '5f34909a36c6be05506cb936cd683b9ec0be8e26':
Add APP_ABI for module-exports sample
|
2015-03-20 21:47:46 +00:00 |
|
Sungsoo Lim
|
1eab557d58
|
am 1d1cb1fb: am 51324e22: Merge "Remove the dummy implementation of onContentUnblocked()" into lmp-dev
* commit '1d1cb1fbcac17fa76734f139e5db3d0a9194ef47':
|
2015-03-20 21:47:40 +00:00 |
|
Andrew Hsieh
|
09eb012a12
|
am 7eedf0e8: am 41c21169: am 30c2909f: Merge "Refresh 64-bit headers/libs (WW29)"
* commit '7eedf0e8dbd63c631790bb7e8e6236b5b1571e8d':
Refresh 64-bit headers/libs (WW29)
|
2015-03-20 21:47:31 +00:00 |
|
Andrew Hsieh
|
402885d781
|
am 126032dd: am 8e1ad1c9: am fa902f33: Merge "Fix gl3stub.h"
* commit '126032ddaeb694770e576a0e4b9c7e91a7e553b9':
Fix gl3stub.h
|
2015-03-20 21:47:27 +00:00 |
|
Baligh Uddin
|
d3d76cd8e2
|
am b6fa917d: am dbd7a9fb: Remove deprecated locales - DO NOT MERGE
* commit 'b6fa917df41eefa7d6ae2ff18d228c4fb643ff7a':
|
2015-03-20 21:47:25 +00:00 |
|
Deepanshu Gupta
|
ac75d42978
|
am 52119669: am 7f295eef: am 8d6dee77: am 9605eaa7: am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '5211966913da9cd866161f6dc3a3e944e04b273d':
|
2015-03-20 21:47:23 +00:00 |
|
Deepanshu Gupta
|
6166de3a49
|
am 8748bd78: am 8b8fca48: am db204c79: am 626baa07: am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '8748bd7852e599daa086739efd3beedf0da16290':
|
2015-03-20 21:47:20 +00:00 |
|
Deepanshu Gupta
|
d2a531c0a4
|
am 6ec20997: am 3b929a7a: am 2aad5082: (-s ours) am 2cdeb60c: am a2c022fa: am 5b6f4fc6: am a20f555a: (-s ours) am f5838d24: am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '6ec209973505f014039264bbf5c23d3012e01dec':
|
2015-03-20 21:47:16 +00:00 |
|
Deepanshu Gupta
|
c7ae45eb96
|
am 11e8e542: am 884d4cb4: am d898a214: (-s ours) am 591f5c8b: am 1fa56bef: am 3271adb9: am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '11e8e542a5674a4b3db0bb4c6eeb594c318db306':
|
2015-03-20 21:47:14 +00:00 |
|
Deepanshu Gupta
|
c8678b801d
|
am f814c978: am e731ac39: am 6b014b79: (-s ours) am 25337462: am ab4bad87: am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit 'f814c978dc694f580e823071fbfaffbbca406538':
|
2015-03-20 21:47:12 +00:00 |
|
Deepanshu Gupta
|
0dfe412506
|
am e9b0c4ae: am 3b9da34f: am a6131422: (-s ours) am 82b828e1: Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev
* commit 'e9b0c4ae4f6efc170b98d1cc6621d72a196528a6':
|
2015-03-20 21:47:10 +00:00 |
|
Chris Craik
|
0c23ff279e
|
am 9879a687: am 644678f9: Update Outline API
* commit '9879a687d068572fdb643cddf5f35bd8740f4b79':
|
2015-03-20 21:47:07 +00:00 |
|
Youngsang Cho
|
50cc5e77ef
|
am aa78cabf: am 3ee98b1a: Merge "AtscTvInput : Add a dummy implementation of abstract onContentUnblocked()" into lmp-dev
* commit 'aa78cabf7b23383435110242f667e6bf118d81dc':
|
2015-03-20 21:47:04 +00:00 |
|
Ying Wang
|
c5f4501805
|
am 059adfb3: am 90b2bdae: Merge "3rd attempt to build and store android_system.jar in sdk builds." into lmp-dev
* commit '059adfb37a850ec595a940c2e33f3f724b68507d':
|
2015-03-20 21:47:01 +00:00 |
|
Yohann Roussel
|
1a0c487bcb
|
am 4f19aae7: am 96489645: am e15f6511: Merge "Move multidex support library"
* commit '4f19aae7979306ec38afcef3b9ece2c31fa8c407':
Move multidex support library
|
2015-03-20 21:46:55 +00:00 |
|
Yohann Roussel
|
bf76c258d9
|
am 1b45a1d9: am a7aa5e0e: (-s ours) am 2d2ce1b6: Merge "Add res folder to multidex SDK projects."
* commit '1b45a1d9642bfda9113899d509096b718cf1f6dd':
Add res folder to multidex SDK projects.
|
2015-03-20 21:46:50 +00:00 |
|
Yohann Roussel
|
690d9b6abf
|
am bf04e111: am 8a8f2488: (-s ours) am 93b72e47: Merge "android-support-multidex-instrumentation in SDK."
* commit 'bf04e111a6a577cbc43e0362f43369a237078314':
android-support-multidex-instrumentation in SDK.
|
2015-03-20 21:46:47 +00:00 |
|
Yohann Roussel
|
9e1226561d
|
am 0a76d3d7: am b8db294e: (-s ours) am c854c636: Merge "Add multidex ADT project to SDK."
* commit '0a76d3d7da01cbb058e28bde594d34accede361d':
Add multidex ADT project to SDK.
|
2015-03-20 21:46:45 +00:00 |
|
Yohann Roussel
|
6c287eee32
|
am 955c4072: am 7ec33a7c: (-s ours) am 0d1b03f1: Merge "Include android-support-multidex in SDK libs."
* commit '955c407204ff975fbbf9047ec7564f04ad1df634':
Include android-support-multidex in SDK libs.
|
2015-03-20 21:46:43 +00:00 |
|
Wonsik Kim
|
ee1a264100
|
am 92dc4e5b: am 859cc5f0: Merge "Adjust to onCreateSession() method signature change" into lmp-dev
* commit '92dc4e5b46e64c64c4b9472b929e69b7cf2cba87':
|
2015-03-20 21:46:41 +00:00 |
|
Ying Wang
|
26c10a3cce
|
am 572a5b7b: am 38bf922a: Merge ""sdk" is not necessarily on the linux command line." into lmp-dev
* commit '572a5b7b208d4dd15ff1e2bcb83b9b9616acbdc4':
|
2015-03-20 21:46:39 +00:00 |
|
Jae Seo
|
24c48cfef7
|
am 689a6eb7: am c9bdea04: AtscTvInput: Switch to the new buildInputId/buildChannelsUriForXXX API
* commit '689a6eb7d69f01035a8be5a0a9f6672333e5f8ea':
|
2015-03-20 21:46:37 +00:00 |
|
Yigit Boyar
|
e9f30cf6cb
|
am f7c1c539: am 850c44e0: Merge "Update divider item decorator to account for view translation" into lmp-dev
* commit 'f7c1c539ced7337529d08296d119497119bf6381':
|
2015-03-20 21:46:34 +00:00 |
|
Jae Seo
|
769b2055ce
|
am 66ef0f3c: am d85449be: Quick build fix
* commit '66ef0f3c8a6f458f9e70dfc79c894f7ad5f209f4':
|
2015-03-20 21:46:32 +00:00 |
|
Jim Miller
|
e04173e920
|
am 44f8eb15: am 94a862f0: Add new "pin complex" type to supported keyguard PINs
* commit '44f8eb157bc73720d32efc60a01a48cc81aeac94':
|
2015-03-20 21:46:30 +00:00 |
|
Andrew Hsieh
|
7532860672
|
am d54e91cf: am a6b673cd: am 37feee2a: Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap"
* commit 'd54e91cf9bbaa0177935998c30b00661b151b5e8':
Update mipsel and mips64el multilib lib* and lib-bootstrap
|
2015-03-20 21:46:20 +00:00 |
|
Andrew Hsieh
|
9458778b69
|
am dee2e870: am 430b78ad: am 37351fdd: Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib"
* commit 'dee2e870e610797586d08886cbae9d85fbfa06c0':
Remove symlink ndk/platforms/android-L/arch-mips64/lib
|
2015-03-20 21:46:17 +00:00 |
|
Andrew Hsieh
|
2bb6217430
|
am 6bdc9677: am 61aaedb2: am 488f2392: Merge "getSampletime -> getSampleTime"
* commit '6bdc96770e00b9b6c647c4f2be8071d50065439b':
getSampletime -> getSampleTime
|
2015-03-20 21:46:14 +00:00 |
|
Andrew Hsieh
|
6d678f448b
|
am 7086c5c4: am b240fe6d: am 2918193e: Merge "Media NDK files"
* commit '7086c5c4a7e485e81eff59c9be91c5740e4cedcc':
Media NDK files
|
2015-03-20 21:46:10 +00:00 |
|
Andrew Hsieh
|
eabf6d7714
|
am 7cde60b2: am 37b64790: am 8092009a: Merge "NDK media codec sample"
* commit '7cde60b29ee82fdd9df505e265b9b404f6c7d7ec':
NDK media codec sample
|
2015-03-20 21:46:04 +00:00 |
|
Andrew Hsieh
|
23edb84ae7
|
am 61e5e463: am b74edf6b: am 6fdc2791: Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so"
* commit '61e5e463f5fd66a69bfb3b525d793a272286cc32':
ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
|
2015-03-20 21:46:01 +00:00 |
|
Andrew Hsieh
|
4359c008d3
|
am 2cd1f4ce: am 2097b3b7: am 8839697e: Merge "Update OpenSLES_Android.h for API L"
* commit '2cd1f4cec35bd1f044152beee2364c2202ce9b53':
Update OpenSLES_Android.h for API L
|
2015-03-20 21:45:58 +00:00 |
|
Elliott Hughes
|
cd65016bb5
|
am 818b45f4: am 14a67c7e: am be5e8f72: Merge "Stack tool 32/64 bit compatibility fixes."
* commit '818b45f4948776f1ff23c404c524dc483333958b':
Stack tool 32/64 bit compatibility fixes.
|
2015-03-20 21:45:55 +00:00 |
|
Ying Wang
|
4f3a557feb
|
am 32ff33bd: am 59db26c5: Merge "Build and store android_system.jar." into lmp-dev
* commit '32ff33bde38b631d6e70353efd2f859acc66a584':
|
2015-03-20 21:45:52 +00:00 |
|
Tadashi G. Takaoka
|
8c59bd05a3
|
am 5838efd7: am 0d519132: (DO NOT MERGE) Fix SampleSpellCheckerService settings
* commit '5838efd75363a071a1957863e55a60ec117eae93':
|
2015-03-20 21:45:49 +00:00 |
|
Elliott Hughes
|
c2ccd62bd6
|
am a1344f79: am a8e31235: Add the arm64 pstate register to the stack tool.
* commit 'a1344f7939cb3da6018d87ad758f5329c9c3bf7e':
|
2015-03-20 21:45:44 +00:00 |
|
Elliott Hughes
|
97ea86bb9e
|
am 5283a536: am fbc66057: am 535decd2: Merge "Add the arm64 pstate register to the stack tool."
* commit '5283a53663c559dd4efd077be09a5c2c737353e0':
Add the arm64 pstate register to the stack tool.
|
2015-03-20 21:45:32 +00:00 |
|
Jae Seo
|
7377480e6a
|
am ed47e4c0: am ca1c55b3: AtscInput: Add a dummy implementation of abstract onSetCaptionEnabled()
* commit 'ed47e4c0f1ab2f95f6c23a9527ae59cae26ebc53':
|
2015-03-20 21:45:29 +00:00 |
|
Chet Haase
|
c3d21f621d
|
am a141244a: am dcabc1ac: Merge "Add RecyclerView animations for change actions"
* commit 'a141244adb5c073b2ca8c795428156f1597aff79':
|
2015-03-20 21:45:27 +00:00 |
|
Ying Wang
|
f27ae15805
|
am 458970dd: am 4391853b: Fix win_sdk build.
* commit '458970dd0c55217c1acea584fef6b4c1b22471bb':
|
2015-03-20 21:45:25 +00:00 |
|