Scott Main
a8d44d8dbd
am 0964a13c: am 47ef3692: am 88147ca6: am a9de2b8e: am 01d72b37: redirect old google intents page to new common intents page
...
* commit '0964a13c8c8a0681d44721eee429169cc133b941':
redirect old google intents page to new common intents page
2014-02-04 19:37:16 +00:00
Scott Main
0964a13c8c
am 47ef3692: am 88147ca6: am a9de2b8e: am 01d72b37: redirect old google intents page to new common intents page
...
* commit '47ef36923cf7843a13e102658972ebb892159951':
redirect old google intents page to new common intents page
2014-02-04 19:28:45 +00:00
Scott Main
47ef36923c
am 88147ca6: am a9de2b8e: am 01d72b37: redirect old google intents page to new common intents page
...
* commit '88147ca63967094c34792c451f9cbc1e9fd68466':
redirect old google intents page to new common intents page
2014-02-04 19:25:50 +00:00
Scott Main
88147ca639
am a9de2b8e: am 01d72b37: redirect old google intents page to new common intents page
...
* commit 'a9de2b8e0e04b1333126a0131570c03dc4b09610':
redirect old google intents page to new common intents page
2014-02-04 19:23:32 +00:00
Scott Main
a9de2b8e0e
am 01d72b37: redirect old google intents page to new common intents page
...
* commit '01d72b37a87ce8781cd35d5aaa834b508f964be7':
redirect old google intents page to new common intents page
2014-02-04 19:19:24 +00:00
Scott Main
01d72b37a8
redirect old google intents page to new common intents page
...
Change-Id: Iac645c2f3094fa8d362ac6a2bacdbafdd1e36b08
2014-02-04 19:16:24 +00:00
Scott Main
96bca006c4
am d9a4680d: am 0c2c7587: am 788cdd43: am 6ebae474: am 2e3e1da7: add redirect for removed samples page
...
* commit 'd9a4680defa6815e2d4716f73b784ea990011d35':
add redirect for removed samples page
2014-02-04 19:03:06 +00:00
Scott Main
d9a4680def
am 0c2c7587: am 788cdd43: am 6ebae474: am 2e3e1da7: add redirect for removed samples page
...
* commit '0c2c7587d0852231a24ccd2a4f2749633b16e068':
add redirect for removed samples page
2014-02-04 18:55:22 +00:00
Scott Main
0c2c7587d0
am 788cdd43: am 6ebae474: am 2e3e1da7: add redirect for removed samples page
...
* commit '788cdd4335a0bd6cbe4b6efd0d7abf8139bdd6b5':
add redirect for removed samples page
2014-02-04 18:54:08 +00:00
Scott Main
788cdd4335
am 6ebae474: am 2e3e1da7: add redirect for removed samples page
...
* commit '6ebae4742c92daecf18a3a3f1bfbc125c522bd44':
add redirect for removed samples page
2014-02-04 18:51:39 +00:00
Scott Main
6ebae4742c
am 2e3e1da7: add redirect for removed samples page
...
* commit '2e3e1da7ac58c7e9cdc47541553110864ec931a7':
add redirect for removed samples page
2014-02-04 18:49:30 +00:00
Scott Main
2e3e1da7ac
add redirect for removed samples page
...
Change-Id: I918d2c501ae9be881d578cda03218db6317cbcb6
2014-02-04 10:46:52 -08:00
Andrew Hsieh
4618dc6c2a
Rename arch-aarch64 to arch-arm64
...
Build instruction:
./build/tools/download-toolchain-sources.sh /tmp/ndk-$USER/src
./build/tools/gen-platforms.sh --minimal --dst-dir=$NDK \
--ndk-dir=$NDK --overlay --arch=arm64
./build/tools/build-gcc.sh /tmp/ndk-$USER/src $NDK \
aarch64-linux-android-4.8 --try-64
Change-Id: Ieaac9908cd2121981e257113cb8d5d3575c8718e
2014-02-04 17:36:55 +08:00
Tim Murray
59775e126f
am b812b74b: am 78133f53: Merge "Fix build"
...
* commit 'b812b74be9961d6bcdc6d0eacff3831fbf452378':
Fix build
2014-02-03 23:43:56 +00:00
Tim Murray
b812b74be9
am 78133f53: Merge "Fix build"
...
* commit '78133f5323f110b574a471e37a560e90d7213481':
Fix build
2014-02-03 23:37:55 +00:00
Tim Murray
78133f5323
Merge "Fix build"
2014-02-03 23:31:54 +00:00
Nick Kralevich
720b4e94e5
Fix build
...
This was broken due to 390ec00c6693fb20004f357901beae919a79329f
in frameworks/base
Change-Id: Ieaff5f34ef56efdd492af2f2e7c2294448223616
2014-02-03 15:25:34 -08:00
George Mount
971f7a9372
Merge "Revert "Add Trim Path API demo.""
2014-01-31 16:27:16 +00:00
Raphael Moll
95410fd8b9
am 273f790b: am 56142356: Merge "Update revision of Android SDK USB driver for Windows."
...
* commit '273f790b6b2dd354c9df2751e2f96074c1bbfd55':
Update revision of Android SDK USB driver for Windows.
2014-01-31 16:26:42 +00:00
George Mount
bfe084a225
Revert "Add Trim Path API demo."
...
Bug 12489442
This reverts commit fad0b21946 .
Change-Id: I527d0927bf891fc9570e860c158a352e1767474c
2014-01-31 07:23:11 -08:00
George Mount
ca2b0f8c62
Merge "Add PathAnimations ApiDemos."
2014-01-31 15:21:10 +00:00
Xavier Ducrohet
7a8cfbfd7f
am b63c1328: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."
...
* commit 'b63c13281078137e5ae2743af2b34f8f1295c69f':
Android SDK Windows USB driver: Glass PID.
2014-01-31 14:51:01 +00:00
Raphael Moll
273f790b6b
am 56142356: Merge "Update revision of Android SDK USB driver for Windows."
...
* commit '561423569c11698698450b87a91c7a94d5077e5f':
Update revision of Android SDK USB driver for Windows.
2014-01-31 12:17:13 +00:00
Xavier Ducrohet
b63c132810
am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."
...
* commit '55089c32d599d2a7108e10728c59ad1f1b24384d':
Android SDK Windows USB driver: Glass PID.
2014-01-31 10:26:49 +00:00
Yuhao Zheng
d696802441
Merge "Add opt/net/wifi/service to eclipse .classpath"
2014-01-31 06:01:09 +00:00
Raphael Moll
56a3664913
Update revision of Android SDK USB driver for Windows. DO NOT MERGE.
...
Rev 9 adds the Glass PID.
(Merged from AOSP 8221674986 )
Change-Id: I1ec7985b9715d813f6442dad41a27233d8dd4822
2014-01-30 12:27:18 -08:00
Raphael Moll
068a00f850
Android SDK Windows USB driver: Glass PID. DO NOT MERGE.
...
(Merged from AOSP 260db8ce43 )
Change-Id: Id190e9e83c48bf6b3df08707efdbf154720c3a78
2014-01-30 12:27:11 -08:00
Raphael Moll
561423569c
Merge "Update revision of Android SDK USB driver for Windows."
2014-01-30 18:22:23 +00:00
Raphael Moll
8221674986
Update revision of Android SDK USB driver for Windows.
...
Rev 9 adds the Glass PID.
Change-Id: I1ec7985b9715d813f6442dad41a27233d8dd4822
2014-01-30 10:16:57 -08:00
Xavier Ducrohet
55089c32d5
Merge "Android SDK Windows USB driver: Glass PID."
2014-01-29 23:02:54 +00:00
Raphael Moll
260db8ce43
Android SDK Windows USB driver: Glass PID.
...
Change-Id: Id190e9e83c48bf6b3df08707efdbf154720c3a78
2014-01-29 14:57:49 -08:00
Adam Powell
620877f34c
am b9767caa: Updated Support7Demos to follow RecyclerView API changes
...
* commit 'b9767caa951c119945de50ec0a6f1f6113ba44bb':
Updated Support7Demos to follow RecyclerView API changes
2014-01-29 17:55:17 +00:00
Adam Powell
b9767caa95
Updated Support7Demos to follow RecyclerView API changes
...
Move off of deprecated RecyclerView API to illustrate preferred
practices.
Change-Id: I6d2b6450bbb29c55090802b2ccafab6661036dcb
2014-01-28 18:51:11 -08:00
Chet Haase
a6e59a9d7f
Add controls demo with default theme
...
Change-Id: I95cd31cd93e77b17aa2bcacf6e6140aaba719217
2014-01-28 14:13:31 -08:00
Igor Murashkin
b35848625b
Merge changes Ia8070804,I3033b442,I5e9fcebe
...
* changes:
runtest: add an extra pattern for gtest file names (*Tests.[c|cpp])
runtest: add --build-install-only/-i flag to skip test execution
runtest: Update to work with emulator and to build dependencies
2014-01-25 00:32:08 +00:00
Igor Murashkin
f9cfbd39ae
runtest: add an extra pattern for gtest file names (*Tests.[c|cpp])
...
Change-Id: Ia8070804110e8064f79a8063ed6aefc92d71bf7a
2014-01-24 16:03:11 -08:00
Igor Murashkin
8d703533ba
runtest: add --build-install-only/-i flag to skip test execution
...
Change-Id: I3033b442e33a69442b881f0a5a7b9e2299d35d54
2014-01-24 16:03:11 -08:00
Igor Murashkin
a0afc8cfb2
runtest: Update to work with emulator and to build dependencies
...
* Combine dalvik.vm.dexopt-flags with existing to disable verification
* Always do a runtime reset (stop;start) instead of rebooting device
* Build dependencies (mma) if regular build fails (mm)
Change-Id: I5e9fcebeea052c3314d1f4146b074637c329c0a0
2014-01-24 16:03:06 -08:00
Adam Powell
09b5d826dd
am 35421b12: Follow RecyclerView API changes
...
* commit '35421b12299f9569f82c228631c4156fbb3f0b94':
Follow RecyclerView API changes
2014-01-24 00:21:04 +00:00
Adam Powell
35421b1229
Follow RecyclerView API changes
...
Change-Id: Ic273cc51cc9d7096a7a0d8b5f90accd5986e275a
2014-01-23 16:11:09 -08:00
Adam Powell
0305f64106
am e40272d7: Merge "Update sample for RecyclerView" into klp-modular-dev
...
* commit 'e40272d7dc15e198d63f2000ce929016cfff17b9':
Update sample for RecyclerView
2014-01-22 21:39:38 +00:00
Adam Powell
e40272d7dc
Merge "Update sample for RecyclerView" into klp-modular-dev
2014-01-22 21:36:40 +00:00
quddusc
5ac8842bde
am c9dca45a: am c9217022: am 911c8806: am eeea76c2: am 176d0c68: am a6dfbaf0: am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit 'c9dca45a4f6c06743d9118185114e9bbeaa49efb':
docs: Code sample for game controller training class.
2014-01-22 19:52:35 +00:00
quddusc
c9dca45a4f
am c9217022: am 911c8806: am eeea76c2: am 176d0c68: am a6dfbaf0: am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit 'c9217022a6fb254f459a6ab14c900ac7ef2d03f1':
docs: Code sample for game controller training class.
2014-01-22 19:50:21 +00:00
quddusc
c9217022a6
am 911c8806: am eeea76c2: am 176d0c68: am a6dfbaf0: am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit '911c88060a120167e16d14d273e7fafd3c242c1b':
docs: Code sample for game controller training class.
2014-01-22 11:43:45 -08:00
quddusc
911c88060a
am eeea76c2: am 176d0c68: am a6dfbaf0: am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit 'eeea76c257be2f5ab60fdc6126ce6d5749d0ce01':
docs: Code sample for game controller training class.
2014-01-22 11:42:03 -08:00
quddusc
eeea76c257
am 176d0c68: am a6dfbaf0: am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit '176d0c68d5bc41d2332f355b1c5a1324a9b926d8':
docs: Code sample for game controller training class.
2014-01-22 11:40:04 -08:00
quddusc
176d0c68d5
am a6dfbaf0: am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit 'a6dfbaf03710ff5c1099196d3907ddb31d85806f':
docs: Code sample for game controller training class.
2014-01-22 11:37:25 -08:00
quddusc
a6dfbaf037
am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit 'ca789a983563ee222b9feb6409cf8ea1917040c3':
docs: Code sample for game controller training class.
2014-01-22 11:33:55 -08:00
Adam Powell
ebea7fc21e
Update sample for RecyclerView
...
Fix some issues around relayout. Add data set changes and cheese.
Change-Id: Ie3651fa16f2eadd0bf1b168b95509172fcf425fe
2014-01-22 10:50:21 -08:00