Elliott Hughes
cbcbb5539d
am a865d35c: am 092ddc95: Merge "Clean cruft out of the elftree makefile."
...
* commit 'a865d35c48a9239980a589eaf5974333fbb32e79':
Clean cruft out of the elftree makefile.
2015-02-18 00:28:21 +00:00
Elliott Hughes
a865d35c48
am 092ddc95: Merge "Clean cruft out of the elftree makefile."
...
* commit '092ddc95f04c74ebd928c194e7a7af113f7a0337':
Clean cruft out of the elftree makefile.
2015-02-17 21:09:41 +00:00
Elliott Hughes
092ddc95f0
Merge "Clean cruft out of the elftree makefile."
2015-02-17 20:57:25 +00:00
Elliott Hughes
3dbc29e17a
Clean cruft out of the elftree makefile.
...
Change-Id: I5a14c42297331f0a44b9d753f3fe754433b96f98
2015-02-15 11:40:28 -08:00
bohu
cbf0f2e038
am 418d8cac: am bd5680ab: am 9678c58e: am a02de1bd: Merge "Set revision number to 1 for system images" into lmp-mr1-dev
...
* commit '418d8cac94a1e5f5dad0ee232197f2453a595c14':
Set revision number to 1 for system images
2015-02-13 20:44:13 +00:00
bohu
418d8cac94
am bd5680ab: am 9678c58e: am a02de1bd: Merge "Set revision number to 1 for system images" into lmp-mr1-dev
...
* commit 'bd5680abd5202d371ca8b5a37d96ce9874e13876':
Set revision number to 1 for system images
2015-02-13 20:37:04 +00:00
bohu
bd5680abd5
am 9678c58e: am a02de1bd: Merge "Set revision number to 1 for system images" into lmp-mr1-dev
...
* commit '9678c58e022324f57bc54c2b21ac279b56a47aa0':
Set revision number to 1 for system images
2015-02-13 20:29:54 +00:00
bohu
9678c58e02
am a02de1bd: Merge "Set revision number to 1 for system images" into lmp-mr1-dev
...
* commit 'a02de1bd4cfec8335b12eb2451128863add30bdc':
Set revision number to 1 for system images
2015-02-13 20:23:24 +00:00
bohu
a02de1bd4c
Merge "Set revision number to 1 for system images" into lmp-mr1-dev
2015-02-13 18:33:36 +00:00
bohu
3f7c83fc84
Set revision number to 1 for system images
...
Since it is going be the first release of api 22 system images,
set it to be 1.
Change-Id: Ida92f6045e4dca2e31108d6c2d5e4a7b251ba81b
2015-02-12 16:15:50 -08:00
Dan Albert
430d257b76
am 55fdad7c: am 273261cc: Merge "Add gdbclient as a real script."
...
* commit '55fdad7cf3d3b0a705df62462a0c08a52f531c23':
Add gdbclient as a real script.
2015-02-12 21:36:32 +00:00
Geoff Mendal
07950cbd0a
am ba3ab463: (-s ours) am 1094b82e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
...
* commit 'ba3ab463e0f4b38f7bc8e37dfe0496151ec7b610':
Import translations. DO NOT MERGE
2015-02-12 21:31:05 +00:00
Dan Albert
55fdad7cf3
am 273261cc: Merge "Add gdbclient as a real script."
...
* commit '273261ccb5e7911f5e86a0eff65c131e803b8407':
Add gdbclient as a real script.
2015-02-12 21:12:35 +00:00
Dan Albert
273261ccb5
Merge "Add gdbclient as a real script."
2015-02-12 21:02:35 +00:00
Dan Albert
a624edc117
Add gdbclient as a real script.
...
Makes the modify/test cycle much easier since we don't have to
re-source envsetup each time now.
Change-Id: Ibd942086c91b9cfa598c9329d4e8483102d65fa3
2015-02-12 12:38:17 -08:00
Geoff Mendal
ba3ab463e0
am 1094b82e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
...
* commit '1094b82e1768c215c301ed678e6ff3c81da3ba10':
Import translations. DO NOT MERGE
2015-02-12 20:25:20 +00:00
Geoff Mendal
1094b82e17
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
2015-02-12 20:17:55 +00:00
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
Geoff Mendal
f3e48a7a42
Import translations. DO NOT MERGE
...
Change-Id: Ia44e79adec985b6c119c558285d12eb089bab2d6
Auto-generated-cl: translation import
2015-02-12 11:30:45 -08: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