Trevor Johns
|
0d473ea178
|
am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
* commit '721cd1b86ac6638b55b0fb20f12695aa32916dd9':
Update sdk.atree and samples/browseable for lastest samples release
|
2015-03-30 23:54:56 +00:00 |
|
Etan Cohen
|
0650f6cdd4
|
Merge commit 'c84e7b11e598d5a6c07c754755382279e194efcb' into merge
|
2015-03-30 16:54:20 -07:00 |
|
Trevor Johns
|
721cd1b86a
|
am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
* commit '77b5d394ff91872896c69f5cee93a126f3aed92e':
Update sdk.atree and samples/browseable for lastest samples release
|
2015-03-30 23:47:14 +00:00 |
|
Trevor Johns
|
77b5d394ff
|
Update sdk.atree and samples/browseable for lastest samples release
Synced to developers/samples/android commit
97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910.
Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
|
2015-03-30 16:06:43 -07:00 |
|
Chris Banes
|
70aad0f719
|
am eb072c1c: Merge "Add hide on scroll demo" into lmp-mr1-ub-dev
* commit 'eb072c1c17334e29a057342d5f5fa6375745fb03':
Add hide on scroll demo
|
2015-03-30 20:57:43 +00:00 |
|
Chris Banes
|
eb072c1c17
|
Merge "Add hide on scroll demo" into lmp-mr1-ub-dev
|
2015-03-30 20:50:48 +00:00 |
|
Dan Albert
|
99ad31c686
|
am e1915bdd: am 3ba45f78: am 2474617f: Merge "Allow libbase to be used on Windows."
* commit 'e1915bdd6302e4ea6abe363d04ad8eba9bbf3df8':
Allow libbase to be used on Windows.
|
2015-03-30 18:50:29 +00:00 |
|
Dan Albert
|
e1915bdd63
|
am 3ba45f78: am 2474617f: Merge "Allow libbase to be used on Windows."
* commit '3ba45f7871ff9705ed6e994304c44b724feed2a2':
Allow libbase to be used on Windows.
|
2015-03-30 18:43:42 +00:00 |
|
Dan Albert
|
3ba45f7871
|
am 2474617f: Merge "Allow libbase to be used on Windows."
* commit '2474617f0162c7de1c359321071706540983cd2d':
Allow libbase to be used on Windows.
|
2015-03-30 18:36:33 +00:00 |
|
Dan Albert
|
2474617f01
|
Merge "Allow libbase to be used on Windows."
|
2015-03-30 17:47:20 +00:00 |
|
Xavier Ducrohet
|
b0735703ab
|
am 4da695a3: (-s ours) am 54b50638: am e9013bf3: am 835221bf: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit '4da695a3c3aa2bc0e043ff18213959a6875bc122':
|
2015-03-27 01:38:41 +00:00 |
|
Xavier Ducrohet
|
4da695a3c3
|
am 54b50638: am e9013bf3: am 835221bf: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit '54b50638ad3e36235c917987eccc7255ee1c6308':
|
2015-03-27 01:23:38 +00:00 |
|
Xavier Ducrohet
|
54b50638ad
|
am e9013bf3: am 835221bf: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit 'e9013bf3291c8eeccb1d6f793640b94d30186cf1':
|
2015-03-27 01:08:48 +00:00 |
|
Xavier Ducrohet
|
e9013bf329
|
am 835221bf: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit '835221bfd3a67629525ae601fce968302c35980d':
|
2015-03-27 00:48:55 +00:00 |
|
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
|
d6ab5c2552
|
am 62120b2c: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/development into lmp-mr1-ub-dev
* commit '62120b2c6326762e061ce5cfb75513e5206f92df':
|
2015-03-26 22:32:00 +00:00 |
|
The Android Automerger
|
76d97aab5e
|
am 66238783: am 7570c73e: am dfe61de0: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit '66238783b33581e58eeaebbcccf0e26ff48e485c':
Update version of the build tools to be 22.0.0
|
2015-03-26 22:31:59 +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 |
|
Pierre Vandwalle
|
c84e7b11e5
|
add wifi power calculation
Change-Id: I3176d835454b1324403b844d075709ba277a7189
|
2015-03-24 19:40:32 -07:00 |
|
Xavier Ducrohet
|
e12e1637ad
|
am c2fd9a35: (-s ours) am 7012c6fc: am 7fc65bda: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
* commit 'c2fd9a355ced12edb4e81a0545ee002f70270be8':
Update build tools version to 22.0.2. DO NOT MERGE.
|
2015-03-24 03:25:42 +00:00 |
|
Xavier Ducrohet
|
d8f9b78016
|
am d9e9e60f: (-s ours) Update build tools version to 22.0.2. DO NOT MERGE.
automerge: 06d9752 -s ours
* commit '06d9752018b749a438db5a21e5d0a3d05725db1e':
Update build tools version to 22.0.2. DO NOT MERGE.
|
2015-03-24 01:37:24 +00:00 |
|
Narayan Kamath
|
d95f8c708c
|
am d3b57a16: am 8a9dd8d1: am 05bbd6dd: Merge "Remove reference to libzipfile."
* commit 'd3b57a16b2330fcf29eeb7b00ad189da01dddb54':
Remove reference to libzipfile.
|
2015-03-24 01:31:40 +00:00 |
|
Chris Banes
|
6900338db7
|
am f51cf635: Merge "TextInputLayout and Snackbar demos" into lmp-mr1-ub-dev
* commit 'f51cf635a3daf63a64a16202bf0d36db4777257c':
TextInputLayout and Snackbar demos
|
2015-03-24 01:31:26 +00: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
|
06d9752018
|
am d9e9e60f: (-s ours) 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:26:02 +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 |
|
Kris Giesing
|
7da011443a
|
am ff994c3d: am c5ba8fc0: am 02000988: am 818a7473: Merge "Add demos for GuidedStepFragment." into lmp-mr1-ub-dev
* commit 'ff994c3d245990f70cdf3717866b24d0f5ab34e7':
|
2015-03-23 22:43:38 +00:00 |
|
Craig Stout
|
a91363a343
|
am 30c48cd5: am 3762e5a9: am b477cc7f: am 623cfb01: Merge "Add branding to DetailsFragment and TitleHelper with RowsFragment." into lmp-mr1-ub-dev
* commit '30c48cd54a9f5d2887d82b40f1357135be0adbf1':
|
2015-03-23 22:43:33 +00:00 |
|
Craig Stout
|
eee3849b8e
|
am 93b9a43d: am 5f052b26: am 4c56adc9: am 09f91e6e: Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev
* commit '93b9a43da5f40aabdd97435ca6fd5dea37ea2dff':
|
2015-03-23 22:43:28 +00:00 |
|
Xavier Ducrohet
|
e8d1ed23c1
|
am a47ba501: (-s ours) am 2bc7c211: am 03dfa603: am cd572c00: am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE.
* commit 'a47ba5013917c20fd8b7da4ae13fdfb01ae7541f':
|
2015-03-23 22:43:27 +00:00 |
|
Dan Albert
|
bebf294101
|
am 98aac243: am 73b3f5cd: am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too."
* commit '98aac243acb780f7d37e4fafa40c11cbc99572a5':
|
2015-03-23 22:43:24 +00:00 |
|
Dan Albert
|
19834d951c
|
am bd4172b0: am e0f3196e: am 170b153b: Merge "Fix library paths for SDK tools."
* commit 'bd4172b085456b82efbdd623118576ded382255c':
|
2015-03-23 22:43:22 +00:00 |
|
Deepanshu Gupta
|
bc9b388420
|
am 215e4599: (-s ours) 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 '215e4599647bcf4be5cb19c6bed05d9df4b53860':
|
2015-03-23 22:43:21 +00:00 |
|
Xavier Ducrohet
|
36435c8827
|
am d479f5a9: am a244c58a: am d0598e91: am 5db57146: am aeb400d3: Reset support version to <API>.0.0
* commit 'd479f5a9aa4f522b7bd3ac5a8f3114d8c5f8d03c':
|
2015-03-23 22:43:16 +00:00 |
|
Xavier Ducrohet
|
dc0990b57c
|
am 3b58afd3: am e66b671d: am 3565380e: am 2762443c: Merge "Mips system image also supports gpu."
* commit '3b58afd38d063d04575f0393c20b53b8ae9f194c':
|
2015-03-23 22:43:14 +00:00 |
|
Xavier Ducrohet
|
65a02d0977
|
am 47042161: am 05d097e1: am c4abfa22: am 3dbe2f82: am d9273517: Update version of the build tools to be 22.0.0
* commit '4704216100bd414161c36df3db5f3d340c438b4c':
|
2015-03-23 22:43:10 +00:00 |
|
Craig Stout
|
8978d1b944
|
am 852c2982: am 053eb7e9: am d07078d2: am aaa3fa06: Default to using wrap content for row height.
* commit '852c2982e9f6d5b8e32be2d5e2c911af1d78a37d':
|
2015-03-23 22:43:05 +00:00 |
|
Craig Stout
|
09a4a2c72f
|
am 5e32ef30: am d7eb2ab1: am 12f481fb: am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev
* commit '5e32ef30b17ca68a30179262c9aae5287406e338':
|
2015-03-23 22:43:01 +00:00 |
|
Geoff Mendal
|
044036d6c0
|
am 3138de35: (-s ours) am 222dead3: (-s ours) am dd4dc51a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '3138de35c602fa7c978afcb41b8936210c7d8be4':
|
2015-03-23 22:42:59 +00:00 |
|
Geoff Mendal
|
7f6ff8c6ee
|
am 8d59b117: (-s ours) am bb43771d: (-s ours) am ee5bd86e: (-s ours) Import translations. DO NOT MERGE
* commit '8d59b117bd4b0fed7d61d081878edd7fee81d54c':
|
2015-03-23 22:42:57 +00:00 |
|
Dake Gu
|
5765efd124
|
am c6905107: am 602c6910: am 6efdf6b7: am 69cabd12: ItemClickedListener -> ItemViewClickedListener
* commit 'c6905107644d64934efb7aea12d93a176cc8782f':
|
2015-03-23 22:42:53 +00:00 |
|
Jim Miller
|
d01b54d4da
|
am 94afbf52: am 71abf355: am 34bdc613: am fe07a079: am 18c5fb7c: Fix the build
* commit '94afbf52590578cdb812db796f8d50e2c4b46d74':
|
2015-03-23 22:42:48 +00:00 |
|
Dan Albert
|
aa3d567c55
|
am 8e34cc80: am 5e6df5ab: am f1c280b4: am 7ce263a8: Merge "Make adb_api.h safe to include first."
* commit '8e34cc80ea8116cd09cfb44a28e0b5a66e7ecc0d':
|
2015-03-23 22:42:46 +00:00 |
|
Chris Banes
|
03cad7f624
|
am 2e7d77ed: am abdd0b39: am c841e38f: am 9ad1e854: Update sdk.atree for new Palette dir structure
* commit '2e7d77ed7af1a7094e7dc2455b667e929ed78947':
|
2015-03-23 22:42:42 +00:00 |
|
Elliott Hughes
|
e4c91ace93
|
am d63b4a57: am a863a264: am 6b50c254: am e7c31ba1: Merge "Add missing <stdlib.h> include to the native app glue."
* commit 'd63b4a5781788b5df456f7630573ed479a0adf76':
|
2015-03-23 22:42:40 +00:00 |
|
Chris Banes
|
b4aec6a3ed
|
am 7cd69fa2: am 7114b925: am 531ebcdc: am 2797e1a4: Merge "AlertDialog Demo" into lmp-mr1-ub-dev
* commit '7cd69fa28445f81836b4ae2843e6c0df6f0c6b6e':
|
2015-03-23 22:42:35 +00:00 |
|