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
Andrew Hsieh
fdab103cee
am 57a4cd15: am d163bd84: am 5d8817f5: am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
...
* commit '57a4cd15c8b73c4b1e95eea159217152b840e53f':
2015-03-20 21:45:22 +00:00
Andrew Hsieh
03eaa6a6cb
am d6de9175: am d749247c: am 70aad066: am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
...
* commit 'd6de917533aaa63530484228cb0f6d0a078dd19d':
2015-03-20 21:45:20 +00:00
Andrew Hsieh
3c11b66433
am cebae748: am f52b8c34: am 3eb82eca: am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
...
* commit 'cebae748557cd3cd9e0a9d9d841eb3706032b707':
2015-03-20 21:45:18 +00:00
Leon Scroggins III
71379d35f8
am 858d16f2: am c7095947: Call setShader after setLocalMatrix.
...
* commit '858d16f2218b4bff58c4b0611ebfbfd95a64a78c':
2015-03-20 21:45:16 +00:00
Deepanshu Gupta
b67b660941
am d38e53e9: am ba188a67: am 2c353e75: (-s ours) Update platform SDK component to L
...
* commit 'd38e53e9f3d01339102162558096ca2018c2dc8e':
2015-03-20 21:45:14 +00:00
Elliott Hughes
6bcba63465
am fd12270b: am ae207056: am 95f5ef2a: am e72af215: am 8de48e23: Merge "Fix testrunner\'s reference to icu4c."
...
* commit 'fd12270bfdb95d5b806575990bc89b8cbcd75d4c':
2015-03-20 21:45:12 +00:00
Tony Wickham
fd83f00861
am 8dd30e64: am 86d72d3c: am 39ae7d22: am 542963ee: Merge "Added _index.html and screenshots to all samples." into klp-modular-dev
...
* commit '8dd30e64883668ce51d34923735398a56f6aa486':
2015-03-20 21:45:10 +00:00
Deepanshu Gupta
8a16585afa
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 '8788379a42243490c579cd7ee0d03f415ff76dd2':
2015-03-20 21:45:08 +00:00
Deepanshu Gupta
5077dc9174
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 '176fbffdaa85139c383994d3860ca85860df386c':
2015-03-20 21:45:06 +00:00
Deepanshu Gupta
e7fc6902ae
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 '45b4fa1b108ed98da69564dea62fd314501126b6':
2015-03-20 21:45:04 +00:00
Dmitriy Ivanov
52f27abb8c
am 3f5034e0: am ba1f98e1: am 7a6c4e92: am 95c0db1e: am ce3b58a6: Merge "Update dlext.h header"
...
* commit '3f5034e0a5eb627dd80d4c3a8dd53b837c2bacda':
2015-03-20 21:45:01 +00:00
Chris Banes
af6ed61d7b
am 0a09c0cc: am 170658dd: Update Support7Demos to include Palette demos
...
* commit '0a09c0ccdf27315577af6271bacb3049b8ca3a40':
2015-03-20 21:44:59 +00:00
Andrew Hsieh
bd5bc08e0b
am 21a0ffb4: am a29134d4: am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
...
* commit '21a0ffb486a17803dd53ee7c2017c41ac3b36c48':
2015-03-20 21:44:55 +00:00
Andrew Hsieh
9d17f5bdbe
am 280f11d8: am 693fa5d8: am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
...
* commit '280f11d80af56b577474cf5c9c95854ac9cfabf7':
2015-03-20 21:44:52 +00:00
Andrew Hsieh
3f2e6c40a0
am 861a7ab9: am 45ac4eec: am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
...
* commit '861a7ab907ee5bc9b47e527114129e6a1f48fc80':
2015-03-20 21:44:48 +00:00
Elliott Hughes
92b87afd3d
am a400d530: am e72af215: am 8de48e23: Merge "Fix testrunner\'s reference to icu4c."
...
* commit 'a400d5303ad41b968a4ecb1c777c1389025ab637':
2015-03-20 21:44:45 +00:00
Dmitriy Ivanov
3f57061cc7
am 859ffba8: am 95c0db1e: am ce3b58a6: Merge "Update dlext.h header"
...
* commit '859ffba812457c4a00e2f2f073b1c6db9aa603bc':
2015-03-20 21:44:30 +00:00
Kris Giesing
d1eaf438dc
am c5ba8fc0: am 02000988: am 818a7473: Merge "Add demos for GuidedStepFragment." into lmp-mr1-ub-dev
...
* commit 'c5ba8fc04ccf45b49270b3f0ca081f42bf1485b4':
Add demos for GuidedStepFragment.
2015-03-19 16:59:07 +00:00
Kris Giesing
c5ba8fc04c
am 02000988: am 818a7473: Merge "Add demos for GuidedStepFragment." into lmp-mr1-ub-dev
...
* commit '02000988f8598a5027bc08ebe0bc923d897c1157':
Add demos for GuidedStepFragment.
2015-03-19 16:51:44 +00:00
Kris Giesing
02000988f8
am 818a7473: Merge "Add demos for GuidedStepFragment." into lmp-mr1-ub-dev
...
* commit '818a7473fd7217f5d09f1dc115663a0af50141e9':
Add demos for GuidedStepFragment.
2015-03-19 16:45:36 +00:00
Kris Giesing
818a7473fd
Merge "Add demos for GuidedStepFragment." into lmp-mr1-ub-dev
2015-03-19 16:41:24 +00:00
Kris Giesing
bfcde222e9
Add demos for GuidedStepFragment.
...
Make the main activity a guided step that allows the selection of
other activities. Add a dedicated activity to represent a
sequence of GuidedStepFragments.
b/18935698
Change-Id: I16142f4d7e87b3f2f02b812faa9bff82ecf5361c
2015-03-17 16:36:48 -07:00
Craig Stout
a38058de25
am 3762e5a9: am b477cc7f: am 623cfb01: Merge "Add branding to DetailsFragment and TitleHelper with RowsFragment." into lmp-mr1-ub-dev
...
* commit '3762e5a9dc5b8952814f8ba965e20784fd585760':
Add branding to DetailsFragment and TitleHelper with RowsFragment.
2015-03-17 20:03:47 +00:00
Craig Stout
21c4a88a26
am 5f052b26: am 4c56adc9: am 09f91e6e: Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev
...
* commit '5f052b26ee338e44d2f92f550a7b4c8d19d7282f':
Fix missing api on kitkat.
2015-03-17 20:03:45 +00:00
Xavier Ducrohet
7da359a1af
am 2bc7c211: (-s ours) am 03dfa603: am cd572c00: am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE.
...
* commit '2bc7c21179ebdb30ced37459c006a55042a9fef3':
Update build tools to 22.0.1. DO NOT MERGE.
2015-03-17 20:03:42 +00:00
Craig Stout
3762e5a9dc
am b477cc7f: am 623cfb01: Merge "Add branding to DetailsFragment and TitleHelper with RowsFragment." into lmp-mr1-ub-dev
...
* commit 'b477cc7f5c08e11f43b4c3c88ead1cd617916a49':
Add branding to DetailsFragment and TitleHelper with RowsFragment.
2015-03-17 19:57:44 +00:00
Craig Stout
5f052b26ee
am 4c56adc9: am 09f91e6e: Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev
...
* commit '4c56adc9164c172bff6832111c201cce5ddb01eb':
Fix missing api on kitkat.
2015-03-17 19:57:39 +00:00
Xavier Ducrohet
2bc7c21179
am 03dfa603: am cd572c00: am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE.
...
* commit '03dfa603106b1c707e835628ce3ef98279998dd7':
Update build tools to 22.0.1. DO NOT MERGE.
2015-03-17 19:57:33 +00:00
Craig Stout
b477cc7f5c
am 623cfb01: Merge "Add branding to DetailsFragment and TitleHelper with RowsFragment." into lmp-mr1-ub-dev
...
* commit '623cfb01dd4e7b0ab9fbb136c016034e2c440d52':
Add branding to DetailsFragment and TitleHelper with RowsFragment.
2015-03-17 19:51:05 +00:00
Craig Stout
4c56adc916
am 09f91e6e: Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev
...
* commit '09f91e6e237024b7c9ece70cf296ec325e9f83d9':
Fix missing api on kitkat.
2015-03-17 19:51:03 +00:00
Craig Stout
623cfb01dd
Merge "Add branding to DetailsFragment and TitleHelper with RowsFragment." into lmp-mr1-ub-dev
2015-03-17 19:47:08 +00:00
Craig Stout
09f91e6e23
Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev
2015-03-17 19:46:48 +00:00
Xavier Ducrohet
03dfa60310
am cd572c00: am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE.
...
* commit 'cd572c00327136d55d168add78515c9a932ddad2':
Update build tools to 22.0.1. DO NOT MERGE.
2015-03-16 22:36:58 +00:00
Xavier Ducrohet
cd572c0032
am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE.
...
* commit '4ea9bca1234a5a122d4c8db39dc2b4dde5799928':
Update build tools to 22.0.1. DO NOT MERGE.
2015-03-16 22:28:04 +00:00
Xavier Ducrohet
4ea9bca123
Update build tools to 22.0.1. DO NOT MERGE.
...
Bug: 19085051
Change-Id: Ia62982e7bee589c37f8a755d7e6bb51264556412
2015-03-16 15:21:39 -07:00
Dianne Hackborn
3e8a010ab6
Merge "Add API demo for sharing."
2015-03-16 18:05:59 +00:00
Dan Albert
a489ea0141
am 73b3f5cd: am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too."
...
* commit '73b3f5cde4bfdebbe4893f0234d1b0a9ddd09640':
Fix SDK library paths for Windows and Darwin too.
2015-03-14 04:08:35 +00:00
Dan Albert
73b3f5cde4
am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too."
...
* commit '80dd2ac93d4e89c419eb9c57ddf3178212180564':
Fix SDK library paths for Windows and Darwin too.
2015-03-14 03:12:43 +00:00