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 |
|
Elliott Hughes
|
cf9163211d
|
am 97ea86bb: am 5283a536: am fbc66057: am 535decd2: Merge "Add the arm64 pstate register to the stack tool."
* commit '97ea86bb9e8268bac8fe0ee258fab4d3247510c7':
|
2015-03-22 00:32:08 +00:00 |
|
Jae Seo
|
fac40040ab
|
am 7377480e: am ed47e4c0: am ca1c55b3: AtscInput: Add a dummy implementation of abstract onSetCaptionEnabled()
* commit '7377480e6a408dc695c6b7de961c8e81e2e12247':
|
2015-03-22 00:32:05 +00:00 |
|
Chet Haase
|
4dcbdc8fcd
|
am c3d21f62: am a141244a: am dcabc1ac: Merge "Add RecyclerView animations for change actions"
* commit 'c3d21f621da15b5afb5e9f01ab67286a6713d754':
|
2015-03-22 00:32:02 +00:00 |
|
Ying Wang
|
3fbfda2621
|
am f27ae158: am 458970dd: am 4391853b: Fix win_sdk build.
* commit 'f27ae15805708eb2905663b14e5b11da938b2413':
|
2015-03-22 00:31:59 +00:00 |
|
Andrew Hsieh
|
97848100f2
|
am fdab103c: am 57a4cd15: am d163bd84: am 5d8817f5: am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
* commit 'fdab103ceea5a485bc8aefd0547d5814d44f44d6':
|
2015-03-22 00:31:56 +00:00 |
|
Andrew Hsieh
|
93befd9187
|
am 03eaa6a6: am d6de9175: am d749247c: am 70aad066: am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
* commit '03eaa6a6cb024cf15463f3e314fa4fef391c50a6':
|
2015-03-22 00:31:53 +00:00 |
|
Andrew Hsieh
|
479ad5e7d4
|
am 3c11b664: am cebae748: am f52b8c34: am 3eb82eca: am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
* commit '3c11b66433335d7895bf7d62b0989d5757c1b46a':
|
2015-03-22 00:31:48 +00:00 |
|
Leon Scroggins III
|
e37d39a20e
|
am 71379d35: am 858d16f2: am c7095947: Call setShader after setLocalMatrix.
* commit '71379d35f81abf6b312f1e6ac5ac85b4c772a62f':
|
2015-03-22 00:31:42 +00:00 |
|
Deepanshu Gupta
|
6fc7fa4cda
|
am b67b6609: am d38e53e9: am ba188a67: am 2c353e75: (-s ours) Update platform SDK component to L
* commit 'b67b660941577d1f4f426d47b2b43b0dc324b7a7':
|
2015-03-22 00:31:39 +00:00 |
|
Elliott Hughes
|
dad78f37c4
|
am 6bcba634: am fd12270b: am ae207056: am 95f5ef2a: am e72af215: am 8de48e23: Merge "Fix testrunner\'s reference to icu4c."
* commit '6bcba634651a94d688f2889aa261f1c1ef3980d2':
|
2015-03-22 00:31:33 +00:00 |
|
Tony Wickham
|
966e8455bc
|
am fd83f008: am 8dd30e64: am 86d72d3c: am 39ae7d22: am 542963ee: Merge "Added _index.html and screenshots to all samples." into klp-modular-dev
* commit 'fd83f0086152668b14f05e7c7d9073e40415382c':
|
2015-03-22 00:31:27 +00:00 |
|
Deepanshu Gupta
|
d3ca9217b5
|
am 8a16585a: (-s ours) am 8788379a: am 52ec473f: am 9dabcc8d: (-s ours) am fc3efcd2: am d6ce63a3: am 6bd8a043: am fdafffee: (-s ours) am af01e43f: am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit '8a16585afa72714428f76d43c6782e7ea877c149':
|
2015-03-22 00:31:21 +00:00 |
|
Deepanshu Gupta
|
2fa3da07c7
|
am 5077dc91: (-s ours) am 176fbffd: am a3b0eda9: am 3eb60fc3: (-s ours) am e851bb15: am bc4103e3: am 17bed4f4: am 63527665: (-s ours) am 8a0254ee: am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit '5077dc91741b09b8590d5d02efb173085c96cc07':
|
2015-03-22 00:31:15 +00:00 |
|
Deepanshu Gupta
|
a3e40d6a2d
|
am e7fc6902: (-s ours) am 45b4fa1b: am 6bfaf060: am b79abe56: (-s ours) am 6721a877: am 6aaa1ebb: am 2f5a06e4: am 1066b887: (-s ours) am 7ad693d1: am 35feaff4: Package renamed fonts. [DO NOT MERGE]
* commit 'e7fc6902ae3ae56fadfcf48ba24b37534cb342f0':
|
2015-03-22 00:31:07 +00:00 |
|
Dmitriy Ivanov
|
8d3904253a
|
am 52f27abb: am 3f5034e0: am ba1f98e1: am 7a6c4e92: am 95c0db1e: am ce3b58a6: Merge "Update dlext.h header"
* commit '52f27abb8cf2ff95fef986fb21358d96e738e50a':
|
2015-03-22 00:30:59 +00:00 |
|
Chris Banes
|
d42f6fe091
|
am af6ed61d: am 0a09c0cc: am 170658dd: Update Support7Demos to include Palette demos
* commit 'af6ed61d7b88383cb506ba0ee77d5c21a6b3fcbe':
|
2015-03-22 00:30:52 +00:00 |
|
Andrew Hsieh
|
2950703e09
|
am bd5bc08e: am 21a0ffb4: am a29134d4: am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
* commit 'bd5bc08e0b489b760826b6673a8ae54a8feb420a':
|
2015-03-22 00:30:49 +00:00 |
|
Andrew Hsieh
|
bb43e5fe35
|
am 9d17f5bd: am 280f11d8: am 693fa5d8: am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
* commit '9d17f5bdbed8c46abf4a2406bcca8b71f341a7f2':
|
2015-03-22 00:30:40 +00:00 |
|
Andrew Hsieh
|
7cf21fcedf
|
am 3f2e6c40: am 861a7ab9: am 45ac4eec: am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
* commit '3f2e6c40a0e48f20fa6692139e792623ff98d5d2':
|
2015-03-22 00:30:37 +00:00 |
|
Elliott Hughes
|
af56b7bc32
|
am 92b87afd: am a400d530: am e72af215: am 8de48e23: Merge "Fix testrunner\'s reference to icu4c."
* commit '92b87afd3de5b36253476e6245d29081cacd823b':
|
2015-03-22 00:30:34 +00:00 |
|