Xavier Ducrohet
|
835221bfd3
|
am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit 'd9e9e60f22109b3c8966a41c25b223f40a3d51f9':
Update build tools version to 22.0.2. DO NOT MERGE.
|
2015-03-27 00:33:32 +00:00 |
|
Chih-Hung Hsieh
|
62120b2c63
|
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/development into lmp-mr1-ub-dev
|
2015-03-26 21:28:02 +00:00 |
|
The Android Automerger
|
66238783b3
|
am 7570c73e: am dfe61de0: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit '7570c73e1014ccd5c49fe2e35bec92d5faa4fb41':
Update version of the build tools to be 22.0.0
|
2015-03-26 21:19:45 +00:00 |
|
The Android Automerger
|
7570c73e10
|
am dfe61de0: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit 'dfe61de07eacf1f650911f717b55abb195708033':
Update version of the build tools to be 22.0.0
|
2015-03-26 21:00:24 +00:00 |
|
Craig Stout
|
dcaafe81c8
|
Add BackgroundManager release.
Change-Id: I5a4af31a214f2db26a399db39cf73d578dcbc71c
|
2015-03-25 09:38:21 -07:00 |
|
Xavier Ducrohet
|
c2fd9a355c
|
am 7012c6fc: am 7fc65bda: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit '7012c6fcdb9cf22baa57ea6fb880704f5295635d':
Update build tools version to 22.0.2. DO NOT MERGE.
|
2015-03-24 01:26:58 +00:00 |
|
Xavier Ducrohet
|
7012c6fcdb
|
am 7fc65bda: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit '7fc65bda5beffc76ff249e59103469c1b46c10f7':
Update build tools version to 22.0.2. DO NOT MERGE.
|
2015-03-24 01:20:53 +00:00 |
|
Xavier Ducrohet
|
7fc65bda5b
|
am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit 'd9e9e60f22109b3c8966a41c25b223f40a3d51f9':
Update build tools version to 22.0.2. DO NOT MERGE.
|
2015-03-24 01:14:41 +00:00 |
|
Xavier Ducrohet
|
d9e9e60f22
|
Update build tools version to 22.0.2. DO NOT MERGE.
Change-Id: Icb5bb90fe3b7c31059d97d87ed8e44c0d794236e
|
2015-03-23 14:23:54 -07:00 |
|
Narayan Kamath
|
d3b57a16b2
|
am 8a9dd8d1: am 05bbd6dd: Merge "Remove reference to libzipfile."
* commit '8a9dd8d124f2b4c1d89576895057009da729a4e1':
Remove reference to libzipfile.
|
2015-03-23 10:18:20 +00:00 |
|
Narayan Kamath
|
8a9dd8d124
|
am 05bbd6dd: Merge "Remove reference to libzipfile."
* commit '05bbd6dd357e242ec09d169d219b0b018d258f72':
Remove reference to libzipfile.
|
2015-03-23 10:10:43 +00:00 |
|
Chris Banes
|
f51cf635a3
|
Merge "TextInputLayout and Snackbar demos" into lmp-mr1-ub-dev
|
2015-03-23 10:01:56 +00:00 |
|
Chris Banes
|
2ea6b5d060
|
Add hide on scroll demo
Change-Id: I1c76ad7c5f2c37a4cdfde4e73b9579ec3a633fcb
|
2015-03-23 10:01:15 +00:00 |
|
Narayan Kamath
|
05bbd6dd35
|
Merge "Remove reference to libzipfile."
|
2015-03-23 09:58:39 +00:00 |
|
Kris Giesing
|
ff994c3d24
|
am c5ba8fc0: am 02000988: am 818a7473: Merge "Add demos for GuidedStepFragment." into lmp-mr1-ub-dev
* commit 'c5ba8fc04ccf45b49270b3f0ca081f42bf1485b4':
|
2015-03-21 16:20:21 +00:00 |
|
Craig Stout
|
30c48cd54a
|
am 3762e5a9: am b477cc7f: am 623cfb01: Merge "Add branding to DetailsFragment and TitleHelper with RowsFragment." into lmp-mr1-ub-dev
* commit '3762e5a9dc5b8952814f8ba965e20784fd585760':
|
2015-03-21 16:14:08 +00:00 |
|
Craig Stout
|
93b9a43da5
|
am 5f052b26: am 4c56adc9: am 09f91e6e: Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev
* commit '5f052b26ee338e44d2f92f550a7b4c8d19d7282f':
|
2015-03-21 16:14:04 +00:00 |
|
Xavier Ducrohet
|
a47ba50139
|
am 2bc7c211: am 03dfa603: am cd572c00: am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE.
* commit '2bc7c21179ebdb30ced37459c006a55042a9fef3':
|
2015-03-21 16:13:59 +00:00 |
|
Dan Albert
|
98aac243ac
|
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-21 16:13:57 +00:00 |
|
Dan Albert
|
bd4172b085
|
am e0f3196e: am 170b153b: Merge "Fix library paths for SDK tools."
* commit 'e0f3196e3a65d06874c21639ae4d5db7d82f0f78':
Fix library paths for SDK tools.
|
2015-03-21 16:13:55 +00:00 |
|
Deepanshu Gupta
|
215e459964
|
am 62fdf40a: 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':
|
2015-03-21 16:13:37 +00:00 |
|
Xavier Ducrohet
|
d479f5a9aa
|
am a244c58a: am d0598e91: am 5db57146: am aeb400d3: Reset support version to <API>.0.0
* commit 'a244c58a5d596a15d6d231cc6d58ed6d0a517fe4':
|
2015-03-21 16:13:28 +00:00 |
|
Xavier Ducrohet
|
3b58afd38d
|
am e66b671d: am 3565380e: am 2762443c: Merge "Mips system image also supports gpu."
* commit 'e66b671dc72d62ca12dcb73fd4d3d6386dacabca':
Mips system image also supports gpu.
|
2015-03-21 16:13:14 +00:00 |
|
Xavier Ducrohet
|
4704216100
|
am 05d097e1: am c4abfa22: am 3dbe2f82: am d9273517: Update version of the build tools to be 22.0.0
* commit '05d097e1e739fb3135fbb1c97bb7e2d191be1c0a':
|
2015-03-21 15:26:56 +00:00 |
|
Craig Stout
|
852c2982e9
|
am 053eb7e9: am d07078d2: am aaa3fa06: Default to using wrap content for row height.
* commit '053eb7e94662d44a67fc935d524bf6705b324c30':
|
2015-03-21 15:26:52 +00:00 |
|
Craig Stout
|
5e32ef30b1
|
am d7eb2ab1: am 12f481fb: am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev
* commit 'd7eb2ab1953a653c985b85dce487a16dd5e738ae':
|
2015-03-21 15:26:36 +00:00 |
|
Geoff Mendal
|
3138de35c6
|
am 222dead3: (-s ours) am dd4dc51a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '222dead36e3ca93b3e4d79fcd6c10cc7d5115184':
Import translations. DO NOT MERGE
|
2015-03-21 15:26:34 +00:00 |
|
Geoff Mendal
|
8d59b117bd
|
am bb43771d: (-s ours) am ee5bd86e: (-s ours) Import translations. DO NOT MERGE
* commit 'bb43771d7891465cc58392e2e5bc90f133e7bca8':
Import translations. DO NOT MERGE
|
2015-03-21 15:26:29 +00:00 |
|
Dake Gu
|
c690510764
|
am 602c6910: am 6efdf6b7: am 69cabd12: ItemClickedListener -> ItemViewClickedListener
* commit '602c69109002485984e8f10a0b473fe6f33ca98a':
|
2015-03-21 15:20:08 +00:00 |
|
Jim Miller
|
94afbf5259
|
am 71abf355: am 34bdc613: am fe07a079: am 18c5fb7c: Fix the build
* commit '71abf355011906353a571b471c04027bf2112804':
|
2015-03-21 15:20:03 +00:00 |
|
Dan Albert
|
8e34cc80ea
|
am 5e6df5ab: am f1c280b4: am 7ce263a8: Merge "Make adb_api.h safe to include first."
* commit '5e6df5ab2a40d2562bf06b152b5c11bd3be0d341':
Make adb_api.h safe to include first.
|
2015-03-21 15:20:00 +00:00 |
|
Chris Banes
|
2e7d77ed7a
|
am abdd0b39: am c841e38f: am 9ad1e854: Update sdk.atree for new Palette dir structure
* commit 'abdd0b39b75e440e70f144b3d2f4405cccefd372':
|
2015-03-21 15:19:54 +00:00 |
|
Elliott Hughes
|
d63b4a5781
|
am a863a264: am 6b50c254: am e7c31ba1: Merge "Add missing <stdlib.h> include to the native app glue."
* commit 'a863a264adca7c40e53d539061059cc40670bcc0':
Add missing <stdlib.h> include to the native app glue.
|
2015-03-21 15:19:35 +00:00 |
|
Chris Banes
|
7cd69fa284
|
am 7114b925: am 531ebcdc: am 2797e1a4: Merge "AlertDialog Demo" into lmp-mr1-ub-dev
* commit '7114b925b6e0f8fb5f07b75d0a9c00da0aeb2acc':
|
2015-03-21 15:19:28 +00:00 |
|
Chris Banes
|
f387ae8335
|
am 8f95e8d7: am 97919fdf: am ee2eb13f: Merge "Add ActionMode demos to Support7Demos" into lmp-mr1-ub-dev
* commit '8f95e8d7ab037e723942350999745c230f978d6f':
|
2015-03-21 15:19:23 +00:00 |
|
Bill Yi
|
276546d4e7
|
am bd436549: am 35eb9ae3: Merge commit \'418d8cac94a1e5f5dad0ee232197f2453a595c14\' into HEAD
* commit 'bd4365494578e2f888df8789f458f66463b52781':
|
2015-03-21 05:52:39 +00:00 |
|
bohu
|
33da8a9751
|
am df7fdad9: am 0dd684b2: am 505d46bc: am 6d2c2385: am b45bd0a4: am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-m
* commit 'df7fdad94fdfac68d0bc81d966961784da7832dc':
|
2015-03-21 05:52:20 +00:00 |
|
bohu
|
acc4d4a040
|
am 7f985a3b: am fdabca67: am 986ba2fb: am 08898593: am b71024a6: am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17
* commit '7f985a3b5a6f0d1d55b77b4545c947ac9ec6167c':
|
2015-03-21 05:52:15 +00:00 |
|
bohu
|
a1aab47ac0
|
am 884e3034: am b932d0ce: am 8d65d5ff: am 20601c6a: am 6a06fb6f: am e06de8c0: am 3ef1f569: am fc31df1f: am 31e52ee2: am 65cc9c99: (-s ours) am cfff3894: am 5e44138c: Bump revision number for all the system images
* commit '884e30343efab49f35c41b969ca5f7a6fa3c8748':
|
2015-03-21 05:52:10 +00:00 |
|
bohu
|
99b72e3c45
|
am 6283f598: am e1c81876: am 3e449dec: am 36bff112: am 3ce7eb80: am db8737c8: am a706d1c0: am 21b908ba: (-s ours) am 33bd8cb7: Bump revision number for system images
* commit '6283f5986a26d4feef821582b5891b492859054f':
|
2015-03-21 05:52:08 +00:00 |
|
Craig Stout
|
289f34ca15
|
am 3b3cd1df: am 532dc1f4: am 006d8352: Merge "Add backgrounds." into lmp-mr1-ub-dev
* commit '3b3cd1dfe85e5f72d3ede75b9ece5b12756d59a6':
|
2015-03-21 05:52:04 +00:00 |
|
Elliott Hughes
|
c56e29f31a
|
am 5f454f03: am 19fbca0a: Merge "Remove elftree."
* commit '5f454f031f14362846c782e3862d4a9c0b56c9e0':
Remove elftree.
|
2015-03-21 05:52:02 +00:00 |
|
Elliott Hughes
|
8fcf385aba
|
am fe7c8b69: am 7a35b085: Merge "Use the exported elfutils headers."
* commit 'fe7c8b693ddd8b4250cdb0dd0e5815966ddd0c20':
Use the exported elfutils headers.
|
2015-03-21 05:52:00 +00:00 |
|
Elliott Hughes
|
3cf64f4576
|
am a865d35c: am 092ddc95: Merge "Clean cruft out of the elftree makefile."
* commit 'a865d35c48a9239980a589eaf5974333fbb32e79':
Clean cruft out of the elftree makefile.
|
2015-03-21 05:51:59 +00:00 |
|
bohu
|
be39b0de30
|
am 418d8cac: am bd5680ab: am 9678c58e: am a02de1bd: Merge "Set revision number to 1 for system images" into lmp-mr1-dev
* commit '418d8cac94a1e5f5dad0ee232197f2453a595c14':
|
2015-03-21 05:44:07 +00:00 |
|
Dan Albert
|
d67514ebd8
|
am 55fdad7c: am 273261cc: Merge "Add gdbclient as a real script."
* commit '55fdad7cf3d3b0a705df62462a0c08a52f531c23':
Add gdbclient as a real script.
|
2015-03-21 05:43:56 +00:00 |
|
Geoff Mendal
|
cbd667314d
|
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-03-21 05:43:54 +00:00 |
|
Geoff Mendal
|
fbda111f2d
|
am efd1d365: (-s ours) am 7a598057: (-s ours) Import translations. DO NOT MERGE
* commit 'efd1d36527702b4b55b786fee18e962b401c5f91':
Import translations. DO NOT MERGE
|
2015-03-21 05:43:46 +00:00 |
|
Neil Fuller
|
1920869ec1
|
am e0a3b19f: am f66c8d36: Merge "Remove usages of FloatMath"
* commit 'e0a3b19ffbd69b4401724477d346dc1494bad04a':
Remove usages of FloatMath
|
2015-03-21 05:43:44 +00:00 |
|
Narayan Kamath
|
239bf75734
|
am 8b1958a4: am 91e47149: Fix build (again).
* commit '8b1958a44945ffdc13020c7138335e6a3e58f674':
|
2015-03-21 05:43:39 +00:00 |
|