Kenny Root
|
b89c6fcc08
|
am d70e908f: am 08c5e496: am 2d37bfef: am 9ce4e448: Merge "make_key: reduce raciness of password input"
* commit 'd70e908f48b4978a32c87527a2aba479e4b27c43':
|
2015-03-22 00:35:01 +00:00 |
|
Dongwon Kang
|
f6a0e8fd77
|
am e0eb456d: am 65576ddf: am d256f606: Merge "Remove AtscTvInput in favor of having another sample input under developers." into lmp-dev
* commit 'e0eb456d743c47c6ba2726584d9fe091fe0263a3':
|
2015-03-22 00:34:57 +00:00 |
|
Alan Viverette
|
e45b3688db
|
am 507510c6: am 33b9e4b6: am 7a6a6e7a: Merge "Add switches to the Controls sample in ApiDemos" into lmp-dev
* commit '507510c604a53392ef6311d9260547e0d85e39ef':
|
2015-03-22 00:34:51 +00:00 |
|
Brigid Smith
|
4d5d3fada0
|
am 302b69e2: am f4bf5577: am f893e743: Stack tool 32/64 bit compatibility fixes.
* commit '302b69e29377c2e5cca7ad14699611061aec26c3':
|
2015-03-22 00:34:43 +00:00 |
|
Craig Stout
|
85c0868773
|
am 2eea41be: am 196dc75f: am a38b253e: Merge "Add playback progress." into lmp-dev
* commit '2eea41beea7799873da1aa9bcd5a25e88a2b611c':
|
2015-03-22 00:34:37 +00:00 |
|
Andrew Hsieh
|
1d2dc87e74
|
am efe7a324: am 4bfb4d31: am c59b1400: am 0efeb2c6: Merge "Fix the name of the native app glue lib in a header comment"
* commit 'efe7a324f4c0e559ee35d543a1e7bc13fff6e792':
|
2015-03-22 00:34:31 +00:00 |
|
Alan Lau
|
30ea5a1b49
|
am be5276ec: am b6759681: am afb9296e: am 050972b1: am 2d0d6541: Change setScrollVertically to protected to make scroll work in subclasses.
* commit 'be5276ec9c089a054124233135ee7ed0a0790d90':
|
2015-03-22 00:34:28 +00:00 |
|
Craig Stout
|
b3e2f64bfc
|
am 4dd6396e: am c375cc14: am fb9584cf: Merge "Add PlaybackOverlayFragment" into lmp-dev
* commit '4dd6396ea3ea7b2ed23fedbb7cfd1af90a324f0b':
|
2015-03-22 00:34:25 +00:00 |
|
Alan Viverette
|
8ca6233d77
|
am 6efccab7: am 095e3946: am 974dc59d: Update ApiDemos themes, remove targetSdkVersion
* commit '6efccab7e9ab5d02bc61c3c8a0f72cdbdcc15be4':
|
2015-03-22 00:34:21 +00:00 |
|
Dake Gu
|
10329a64a0
|
am f60b059b: am dcf85159: am d54e6b19: SupportLeanbackDemo: activity transition
* commit 'f60b059b5dae7a66ec44b2f7a9c9d931ba86f4ad':
|
2015-03-22 00:34:18 +00:00 |
|
Griff Hazen
|
cdc60f4a21
|
am 76a5a07a: (-s ours) am 4be1723b: am 3815535c: am 1fd1d233: (-s ours) am 7003893f: DO NOT MERGE Update version of sdk 20 samples to 2
* commit '76a5a07ab41a3614dd9114f9bd6ed07a0867b515':
|
2015-03-22 00:34:16 +00:00 |
|
Jean-Luc Brouillet
|
f3229bf914
|
am ca34f82c: am 62e0ab89: am 58668fc5: Merge "Fix directory where CtsTestStubs.apk is found." into lmp-dev
* commit 'ca34f82c99136a78fc328cdd596d0552fda1636c':
|
2015-03-22 00:34:13 +00:00 |
|
Ying Wang
|
b6d34e223d
|
am eddca2e9: am 99d2b20c: am 06a0ec0b: new installation path of apks.
* commit 'eddca2e9d509533b96b5b686e4cbcb1974303924':
|
2015-03-22 00:34:09 +00:00 |
|
Chulwoo Lee
|
503c5f5f71
|
am d740ddd0: am c7269687: am 9f688cc1: Merge "Put input ID when inserting channels" into lmp-dev
* commit 'd740ddd0824f0b7455f5acf1da4d2bd8b2ca45b5':
|
2015-03-22 00:34:06 +00:00 |
|
Andrew Hsieh
|
32d4195013
|
am ce3a6697: am 5f34909a: am 093774e6: am b50f8f66: Merge "Add APP_ABI for module-exports sample"
* commit 'ce3a6697bbd94b6807606c4d3d11a551042b3107':
|
2015-03-22 00:34:01 +00:00 |
|
Sungsoo Lim
|
90b3ba9734
|
am 1eab557d: am 1d1cb1fb: am 51324e22: Merge "Remove the dummy implementation of onContentUnblocked()" into lmp-dev
* commit '1eab557d58b17eb64ac4616e634662dbc328e6c5':
|
2015-03-22 00:33:56 +00:00 |
|
Andrew Hsieh
|
e33b5a8312
|
am 09eb012a: am 7eedf0e8: am 41c21169: am 30c2909f: Merge "Refresh 64-bit headers/libs (WW29)"
* commit '09eb012a12f6264d13188bea25379829783776b2':
|
2015-03-22 00:33:54 +00:00 |
|
Andrew Hsieh
|
9297d6bb18
|
am 402885d7: am 126032dd: am 8e1ad1c9: am fa902f33: Merge "Fix gl3stub.h"
* commit '402885d7811deacbb04fc989fefd42e3d84f3fed':
|
2015-03-22 00:33:51 +00:00 |
|
Baligh Uddin
|
a5c2f759b9
|
am d3d76cd8: (-s ours) am b6fa917d: am dbd7a9fb: Remove deprecated locales - DO NOT MERGE
* commit 'd3d76cd8e2424eced605c469d4e841401822ac4c':
|
2015-03-22 00:33:49 +00:00 |
|
Deepanshu Gupta
|
c87f39e5a1
|
am ac75d429: 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 'ac75d42978c1602379cda3d9e932965545f805e1':
|
2015-03-22 00:33:46 +00:00 |
|
Deepanshu Gupta
|
26bdd58e3a
|
am 6166de3a: 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 '6166de3a49565f52fad839704746f7265202edd1':
|
2015-03-22 00:33:42 +00:00 |
|
Deepanshu Gupta
|
836c5f44bb
|
am d2a531c0: 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 MER
* commit 'd2a531c0a466e4786b6ef7022f2d99c0698c9a32':
|
2015-03-22 00:33:39 +00:00 |
|
Deepanshu Gupta
|
97be0790d2
|
am c7ae45eb: (-s ours) 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 'c7ae45eb968dee0977bceef0500aaffacfff92bd':
|
2015-03-22 00:33:37 +00:00 |
|
Deepanshu Gupta
|
687f6fc3fa
|
am c8678b80: (-s ours) 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 'c8678b801daf51829440972abe053dc8b68faad5':
|
2015-03-22 00:33:35 +00:00 |
|
Deepanshu Gupta
|
6ff05aa7f2
|
am 0dfe4125: (-s ours) 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 '0dfe412506f1391b0a898a9f351d3aecc502ab5b':
|
2015-03-22 00:33:33 +00:00 |
|
Chris Craik
|
ec06917d42
|
am 0c23ff27: am 9879a687: am 644678f9: Update Outline API
* commit '0c23ff279e948cf841f07b32e75cfa44153773e1':
|
2015-03-22 00:33:30 +00:00 |
|
Youngsang Cho
|
ff3663bbc1
|
am 50cc5e77: am aa78cabf: am 3ee98b1a: Merge "AtscTvInput : Add a dummy implementation of abstract onContentUnblocked()" into lmp-dev
* commit '50cc5e77efd5345ae0069c29e2f873b8fe9b58bd':
|
2015-03-22 00:33:28 +00:00 |
|
Ying Wang
|
1dba706d70
|
am c5f45018: am 059adfb3: am 90b2bdae: Merge "3rd attempt to build and store android_system.jar in sdk builds." into lmp-dev
* commit 'c5f4501805bd48fedd1ab7c5ae107171437e26b7':
|
2015-03-22 00:33:25 +00:00 |
|
Yohann Roussel
|
168f756cfd
|
am 1a0c487b: am 4f19aae7: am 96489645: am e15f6511: Merge "Move multidex support library"
* commit '1a0c487bcbda029c14f4d48ceba25ebb71e5f511':
|
2015-03-22 00:33:22 +00:00 |
|
Yohann Roussel
|
fa1f7485e0
|
am bf76c258: am 1b45a1d9: am a7aa5e0e: (-s ours) am 2d2ce1b6: Merge "Add res folder to multidex SDK projects."
* commit 'bf76c258d93a49ba70db90e2230aba37be6b4084':
|
2015-03-22 00:33:19 +00:00 |
|
Yohann Roussel
|
56abc9a320
|
am 690d9b6a: am bf04e111: am 8a8f2488: (-s ours) am 93b72e47: Merge "android-support-multidex-instrumentation in SDK."
* commit '690d9b6abf36197ff873418c1ffa243ba773ef66':
|
2015-03-22 00:33:16 +00:00 |
|
Yohann Roussel
|
59b55c8c5d
|
am 9e122656: am 0a76d3d7: am b8db294e: (-s ours) am c854c636: Merge "Add multidex ADT project to SDK."
* commit '9e1226561dd99635436a499dab4b7fe94bfb6c65':
|
2015-03-22 00:33:14 +00:00 |
|
Yohann Roussel
|
8aa512ba07
|
am 6c287eee: am 955c4072: am 7ec33a7c: (-s ours) am 0d1b03f1: Merge "Include android-support-multidex in SDK libs."
* commit '6c287eee328ea27632d16b225e8ee101a37bfa2a':
|
2015-03-22 00:33:10 +00:00 |
|
Wonsik Kim
|
f08646cf84
|
am ee1a2641: am 92dc4e5b: am 859cc5f0: Merge "Adjust to onCreateSession() method signature change" into lmp-dev
* commit 'ee1a264100d5df29a51c59f001a6015630416454':
|
2015-03-22 00:33:07 +00:00 |
|
Ying Wang
|
8530942a13
|
am 26c10a3c: am 572a5b7b: am 38bf922a: Merge ""sdk" is not necessarily on the linux command line." into lmp-dev
* commit '26c10a3cceb701095a910f418588357094fb28c9':
|
2015-03-22 00:33:04 +00:00 |
|
Jae Seo
|
2215218389
|
am 24c48cfe: am 689a6eb7: am c9bdea04: AtscTvInput: Switch to the new buildInputId/buildChannelsUriForXXX API
* commit '24c48cfef72876ddace046ccd36656268dfef6a5':
|
2015-03-22 00:33:00 +00:00 |
|
Yigit Boyar
|
1cd50c7623
|
am e9f30cf6: am f7c1c539: am 850c44e0: Merge "Update divider item decorator to account for view translation" into lmp-dev
* commit 'e9f30cf6cb4719df3a990f910ba8123b85213710':
|
2015-03-22 00:32:56 +00:00 |
|
Jae Seo
|
007b7d094d
|
am 769b2055: am 66ef0f3c: am d85449be: Quick build fix
* commit '769b2055ceec0c62d4c4573e131d0fc087b0c4ee':
|
2015-03-22 00:32:52 +00:00 |
|
Jim Miller
|
baf655f04b
|
am e04173e9: am 44f8eb15: am 94a862f0: Add new "pin complex" type to supported keyguard PINs
* commit 'e04173e920a978bb3c76f8e36c768aba4e486572':
|
2015-03-22 00:32:48 +00:00 |
|
Andrew Hsieh
|
3ef2c09dc5
|
am 75328606: am d54e91cf: am a6b673cd: am 37feee2a: Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap"
* commit '75328606721937c1eb3ff9e5a200595a68961e2c':
|
2015-03-22 00:32:43 +00:00 |
|
Andrew Hsieh
|
c8d00c8b65
|
am 9458778b: am dee2e870: am 430b78ad: am 37351fdd: Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib"
* commit '9458778b69594fae476d71572e440eceef646fc7':
|
2015-03-22 00:32:38 +00:00 |
|
Andrew Hsieh
|
b543961002
|
am 2bb62174: am 6bdc9677: am 61aaedb2: am 488f2392: Merge "getSampletime -> getSampleTime"
* commit '2bb621743072f14576df4a75827705714dc18746':
|
2015-03-22 00:32:35 +00:00 |
|
Andrew Hsieh
|
40f3140903
|
am 6d678f44: am 7086c5c4: am b240fe6d: am 2918193e: Merge "Media NDK files"
* commit '6d678f448be9d765031ebd5640253699611207b0':
|
2015-03-22 00:32:32 +00:00 |
|
Andrew Hsieh
|
81c5d1db7a
|
am eabf6d77: am 7cde60b2: am 37b64790: am 8092009a: Merge "NDK media codec sample"
* commit 'eabf6d7714d8cfc041216dc6193cb49e59584796':
|
2015-03-22 00:32:29 +00:00 |
|
Andrew Hsieh
|
eee9fc8c58
|
am 23edb84a: am 61e5e463: am b74edf6b: am 6fdc2791: Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so"
* commit '23edb84ae7ebf0189965cd73b0b30531f90d6a32':
|
2015-03-22 00:32:26 +00:00 |
|
Andrew Hsieh
|
6dc4a8c57b
|
am 4359c008: am 2cd1f4ce: am 2097b3b7: am 8839697e: Merge "Update OpenSLES_Android.h for API L"
* commit '4359c008d3d18e62cb39987c604d857f17c614a8':
|
2015-03-22 00:32:23 +00:00 |
|
Elliott Hughes
|
81b6e43127
|
am cd65016b: am 818b45f4: am 14a67c7e: am be5e8f72: Merge "Stack tool 32/64 bit compatibility fixes."
* commit 'cd65016bb5c8797337086d3a91c5af49f1168292':
|
2015-03-22 00:32:20 +00:00 |
|
Ying Wang
|
079fb1a7f3
|
am 4f3a557f: am 32ff33bd: am 59db26c5: Merge "Build and store android_system.jar." into lmp-dev
* commit '4f3a557feb2380902f9444ff97efe1b94ee2ce16':
|
2015-03-22 00:32:17 +00:00 |
|
Tadashi G. Takaoka
|
005711eece
|
am 8c59bd05: (-s ours) am 5838efd7: am 0d519132: (DO NOT MERGE) Fix SampleSpellCheckerService settings
* commit '8c59bd05a375268887327f883c44a70901043c08':
|
2015-03-22 00:32:15 +00:00 |
|
Elliott Hughes
|
47bf8a96fb
|
am c2ccd62b: am a1344f79: am a8e31235: Add the arm64 pstate register to the stack tool.
* commit 'c2ccd62bd6537e74d4cc04e9914f25ed19980d50':
|
2015-03-22 00:32:12 +00:00 |
|