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
Dmitriy Ivanov
a6a071d2df
am 3f57061c: am 859ffba8: am 95c0db1e: am ce3b58a6: Merge "Update dlext.h header"
...
* commit '3f57061cc797d55a5008cad458ae0ee61b9b7d08':
2015-03-22 00:30:29 +00:00
Geoff Mendal
d459f0ad6d
Merge "Import translations. DO NOT MERGE"
2015-03-21 11:03:06 +00:00
Geoff Mendal
ec01b2f200
Import translations. DO NOT MERGE
...
Change-Id: Ic7184b89c152d64d174c3efc1136d39b4f8354a2
Auto-generated-cl: translation import
2015-03-21 02:20:39 -07:00
Geoff Mendal
6db630d8db
Import translations. DO NOT MERGE
...
Change-Id: I7d32af81fdb48a4a5641fbdcb85b9012dbb29af4
Auto-generated-cl: translation import
2015-03-21 01:24:46 -05: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
Dan Albert
80dd2ac93d
Merge "Fix SDK library paths for Windows and Darwin too."
2015-03-14 03:03:18 +00:00
Dan Albert
d4a1f0619b
Fix SDK library paths for Windows and Darwin too.
...
Change-Id: Ibaae6fd4089c804f50f8065e614c5de1b71c242b
2015-03-14 02:34:38 +00:00
Dan Albert
89f9ff8893
am e0f3196e: am 170b153b: Merge "Fix library paths for SDK tools."
...
* commit 'e0f3196e3a65d06874c21639ae4d5db7d82f0f78':
Fix library paths for SDK tools.
2015-03-14 00:17:27 +00:00
Dan Albert
e0f3196e3a
am 170b153b: Merge "Fix library paths for SDK tools."
...
* commit '170b153b3e3b087f77d806323a685ca0b4597561':
Fix library paths for SDK tools.
2015-03-14 00:13:10 +00:00
Dan Albert
170b153b3e
Merge "Fix library paths for SDK tools."
2015-03-14 00:02:38 +00:00
Dan Albert
b7125622c8
Fix library paths for SDK tools.
...
The rpath for the binaries is ../lib but the libraries were being
installed to the same directory as the executables.
Bug: 19617220
Change-Id: I5c4158698b6703843b67543d4396e2bffc5fb313
2015-03-13 16:30:21 -07:00
Deepanshu Gupta
fcfd3a9621
am 62fdf40a: (-s ours) am 7e830841: am 0536cbb4: am b15f499b: Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev
...
* commit '62fdf40a514cc33f1fa0c698b5279576c533c958':
Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
2015-03-13 05:53:56 +00:00
Xavier Ducrohet
2f05de672c
resolved conflicts for merge of a244c58a to master
...
Change-Id: I26b889dc4bcf5cf1c7923757b362a8f448734c31
2015-03-12 13:27:38 -07:00
