Commit Graph

16556 Commits

Author SHA1 Message Date
Geoff Mendal
4d49d3670c am efd1d365: (-s ours) am 7a598057: (-s ours) Import translations. DO NOT MERGE
* commit 'efd1d36527702b4b55b786fee18e962b401c5f91':
  Import translations. DO NOT MERGE
2015-02-12 19:31:12 +00:00
Neil Fuller
f9c21d6616 am e0a3b19f: am f66c8d36: Merge "Remove usages of FloatMath"
* commit 'e0a3b19ffbd69b4401724477d346dc1494bad04a':
  Remove usages of FloatMath
2015-02-12 19:30:31 +00:00
Narayan Kamath
b91a1f8b55 am 8b1958a4: am 91e47149: Fix build (again).
* commit '8b1958a44945ffdc13020c7138335e6a3e58f674':
  Fix build (again).
2015-02-12 19:30:09 +00:00
Geoff Mendal
efd1d36527 am 7a598057: (-s ours) Import translations. DO NOT MERGE
* commit '7a59805724ca151641dd1cc51337d44657aa1560':
  Import translations. DO NOT MERGE
2015-02-12 18:48:28 +00:00
Geoff Mendal
7a59805724 Import translations. DO NOT MERGE
Change-Id: If55f0a95c6889431d5de9487e61bdce9acff84c3
Auto-generated-cl: translation import
2015-02-12 10:40:02 -08:00
Chris Banes
b4c243102f am 578b16e9: (-s ours) am 4fe89883: Localize Strings in SupportDesignDemos
* commit '578b16e91e5447895c35b04c14dcdbccd8c272ae':
  Localize Strings in SupportDesignDemos
2015-02-12 18:13:11 +00:00
Neil Fuller
e0a3b19ffb am f66c8d36: Merge "Remove usages of FloatMath"
* commit 'f66c8d36ed081d901e495b904965e8f341ed47de':
  Remove usages of FloatMath
2015-02-12 17:42:38 +00:00
Narayan Kamath
8b1958a449 am 91e47149: Fix build (again).
* commit '91e471491826e718347e280ec61bc2edd42302e4':
  Fix build (again).
2015-02-12 16:57:12 +00:00
Narayan Kamath
91e4714918 Fix build (again).
Another set of strings that needed to be localized but were
missed in 4fe89883c2.

(cherry picked from commit 6da3c008cb)

Change-Id: Ibb08df992129361578aeb1c556f4d965ab3404c2
2015-02-12 16:46:11 +00:00
Narayan Kamath
6da3c008cb Fix build (again).
Another set of strings that needed to be localized but were
missed in 4fe89883c2.

Change-Id: Ibb08df992129361578aeb1c556f4d965ab3404c2
2015-02-12 12:44:51 +00:00
Chris Banes
76aa8c5875 Localize Strings in SupportDesignDemos
(cherry picked from commit 4fe89883c2)

Change-Id: I40940d6629f32128b969d169e2893df9c0d169e7
2015-02-12 10:25:51 +00:00
Neil Fuller
f66c8d36ed Merge "Remove usages of FloatMath" 2015-02-12 10:02:14 +00:00
Chris Banes
578b16e91e am 4fe89883: Localize Strings in SupportDesignDemos
* commit '4fe89883c24ce8bd443416b01a6e8db148e8cb4c':
  Localize Strings in SupportDesignDemos
2015-02-12 06:20:45 +00:00
Chris Banes
4fe89883c2 Localize Strings in SupportDesignDemos
Change-Id: I40940d6629f32128b969d169e2893df9c0d169e7
2015-02-11 22:03:04 -08:00
Chris Banes
01d72b205a am a6641e5b: am f212598d: Add new SupportDesignDemos sample app
* commit 'a6641e5b516e5a7468e75df2efcbcfda8124a960':
  Add new SupportDesignDemos sample app
2015-02-12 04:46:00 +00:00
Chris Banes
a6641e5b51 am f212598d: Add new SupportDesignDemos sample app
* commit 'f212598d83cfb8b2e2c2b41ae052fb5402c9e96f':
  Add new SupportDesignDemos sample app
2015-02-12 01:26:40 +00:00
Neil Fuller
501302f264 Remove usages of FloatMath
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: Id6c206045a4d54befe99af9e44732c4967460b28
2015-02-11 15:52:31 +00:00
Chris Banes
f212598d83 Add new SupportDesignDemos sample app
- I've moved the design stuff from Support7Demos

Change-Id: Ibb62a1692550419fea25d297aca5c0c7da0b0dbd
2015-02-10 11:12:30 -08:00
Narayan Kamath
82ac77349d Merge "Add an explicit dependency on org.apache.http.legacy." 2015-02-10 16:18:01 +00:00
Xavier Ducrohet
38828f1684 am 9700884b: (-s ours) am 2787b3ea: am e0621935: am 47ebdd97: am 2c47fd48: Update build-tools version. DO NOT MERGE.
* commit '9700884b89da1aa63f4c67651712e2363cb3708b':
  Update build-tools version. DO NOT MERGE.
2015-02-06 13:31:53 +00:00
Xavier Ducrohet
9700884b89 am 2787b3ea: am e0621935: am 47ebdd97: am 2c47fd48: Update build-tools version. DO NOT MERGE.
* commit '2787b3ea0a6c48f23db2999d4194b11ceacbae39':
  Update build-tools version. DO NOT MERGE.
2015-02-06 00:09:10 +00:00
Xavier Ducrohet
2787b3ea0a am e0621935: am 47ebdd97: am 2c47fd48: Update build-tools version. DO NOT MERGE.
* commit 'e062193561b5dbc682a42a815026397623f54344':
  Update build-tools version. DO NOT MERGE.
2015-02-05 22:01:43 +00:00
Xavier Ducrohet
e062193561 am 47ebdd97: am 2c47fd48: Update build-tools version. DO NOT MERGE.
* commit '47ebdd97527e7fdfca7c62b3569ae3a453afc2f4':
  Update build-tools version. DO NOT MERGE.
2015-02-05 21:56:04 +00:00
Xavier Ducrohet
47ebdd9752 am 2c47fd48: Update build-tools version. DO NOT MERGE.
* commit '2c47fd4871cf8bc8b731d3a9baa66849452c9361':
  Update build-tools version. DO NOT MERGE.
2015-02-05 21:49:17 +00:00
Narayan Kamath
4b952f0df3 Add an explicit dependency on org.apache.http.legacy.
bug: 18027885
Change-Id: Ie3a251fd63ec25a3c5cb46c80236f43724166331
2015-02-05 15:04:30 +00:00
Xavier Ducrohet
2c47fd4871 Update build-tools version. DO NOT MERGE.
Change-Id: Ie67d2b1bdd739241e5f9b7c2ccf8dda5b06d17bc
2015-02-02 17:01:44 -08:00
Elliott Hughes
2442fcbb54 am 46fd3ebe: am 9757f0b7: Merge "Add missing includes."
* commit '46fd3ebe8845ad687912980f820509759b50bc6b':
  Add missing includes.
2015-01-30 21:27:58 +00:00
Adam Powell
fdfd067bfc am a1c7b295: am 57d28dab: Add sample for nested scrolling
* commit 'a1c7b2951fc3f5024c8d20f0ac00f26cd8e48245':
  Add sample for nested scrolling
2015-01-30 21:19:40 +00:00
Elliott Hughes
46fd3ebe88 am 9757f0b7: Merge "Add missing includes."
* commit '9757f0b7855a9359a61029b046d82c23c91695fb':
  Add missing includes.
2015-01-30 21:16:26 +00:00
Adam Powell
a1c7b2951f am 57d28dab: Add sample for nested scrolling
* commit '57d28dab0e11ab5bc7c3220a6b3522bd94f6b1a0':
  Add sample for nested scrolling
2015-01-30 19:34:16 +00:00
Elliott Hughes
9757f0b785 Merge "Add missing includes." 2015-01-30 06:49:26 +00:00
Elliott Hughes
68279ecebc Add missing includes.
Change-Id: I0abe45677d9a5f43aa1db754102701093ff19204
2015-01-29 22:45:19 -08:00
Dan Albert
f0b7ff155c am 366992e5: am 8d17a822: Merge "Default to using clang compatible gcov for host."
* commit '366992e541482af7c875409e56114a6b785ef5fa':
  Default to using clang compatible gcov for host.
2015-01-30 01:29:56 +00:00
Dan Albert
366992e541 am 8d17a822: Merge "Default to using clang compatible gcov for host."
* commit '8d17a8224cbb9aa27ecc611a5a52619aebab2e6f':
  Default to using clang compatible gcov for host.
2015-01-30 01:23:00 +00:00
Dan Albert
8d17a8224c Merge "Default to using clang compatible gcov for host." 2015-01-30 01:09:58 +00:00
Dan Albert
f12f658224 Default to using clang compatible gcov for host.
Also adds the ability to pass arbitrary arguments to lcov, in case the
user needs to override this behavior.

Change-Id: I66b842f92f546fee17a7f1033ef590a3380c14c4
2015-01-29 17:00:16 -08:00
Adam Powell
57d28dab0e Add sample for nested scrolling
Change-Id: Ib4969cbee1228ef3b2b0fca0fb89b87bda1db711
2015-01-30 00:21:15 +00:00
Chris Banes
10866b56e5 am 3afbc048: am 42e327a7: Add button bar dialog sample
* commit '3afbc048e50fc9c2777ec6fd4fb405df0891bcd5':
  Add button bar dialog sample
2015-01-29 22:00:04 +00:00
Chris Banes
3afbc048e5 am 42e327a7: Add button bar dialog sample
* commit '42e327a729032afc2899da763c9d24c9a39c5a7d':
  Add button bar dialog sample
2015-01-29 21:55:53 +00:00
Andrew Hsieh
6580e9ea3b am 95cbf5e1: am a51a0ecc: Merge "Fix mips64 struct stat64"
* commit '95cbf5e1c80d0cbc481fa93ef385599ec0e314c6':
  Fix mips64 struct stat64
2015-01-29 21:39:11 +00:00
Andrew Hsieh
95cbf5e1c8 am a51a0ecc: Merge "Fix mips64 struct stat64"
* commit 'a51a0ecc5def43452ec54b444776c5bfb7dd2830':
  Fix mips64 struct stat64
2015-01-29 21:33:04 +00:00
Andrew Hsieh
a51a0ecc5d Merge "Fix mips64 struct stat64" 2015-01-29 21:25:41 +00:00
Chris Banes
42e327a729 Add button bar dialog sample
BUG: 19192942
Change-Id: I942cbd427c521efc7e284d5dea033e7026f689bb
2015-01-29 21:14:09 +00:00
Andrew Hsieh
58efcc0dfd am 128db12c: am acde2e0d: Merge "Drop clang version check for __builtin_isinf and __builtin_isnan"
* commit '128db12cc37d60d22018b486530215fff20566a8':
  Drop clang version check for __builtin_isinf and __builtin_isnan
2015-01-29 19:49:02 +00:00
Andrew Hsieh
128db12cc3 am acde2e0d: Merge "Drop clang version check for __builtin_isinf and __builtin_isnan"
* commit 'acde2e0dea5d62894dacbe64da534cc2557a1d61':
  Drop clang version check for __builtin_isinf and __builtin_isnan
2015-01-29 19:41:07 +00:00
Andrew Hsieh
c08fb7eb45 Fix mips64 struct stat64
Cherry pick bionic 86d2feef9f4df517dd5755b39b993bec0c3e1ea5 which
fixes struct stat64.  This may look like breaking mips64 ABI, but mips64
support is stil work in progress post-L

Also see prebuilts/ndk e6639a4c0ba9296a19fd477154aace3585221d9d

Change-Id: Ia8859762191220b9d3127b37970f05594375ca40
2015-01-29 11:39:03 -08:00
Andrew Hsieh
acde2e0dea Merge "Drop clang version check for __builtin_isinf and __builtin_isnan" 2015-01-29 19:29:13 +00:00
Chris Banes
82041c240f am e82cb594: am b3ebcc1a: Merge "Add FAB Sample to Support7Demos" into lmp-mr1-ub-dev
* commit 'e82cb5945c1e05762dbdf9adc0c6c255305e0032':
  Add FAB Sample to Support7Demos
2015-01-28 10:16:14 +00:00
Chris Banes
e82cb5945c am b3ebcc1a: Merge "Add FAB Sample to Support7Demos" into lmp-mr1-ub-dev
* commit 'b3ebcc1a6aeb86a8eef955f31db6cf2d53785cbb':
  Add FAB Sample to Support7Demos
2015-01-28 10:10:53 +00:00
Chris Banes
b3ebcc1a6a Merge "Add FAB Sample to Support7Demos" into lmp-mr1-ub-dev 2015-01-28 09:44:57 +00:00