Elliott Hughes
fd521f4a24
am 88c74baa: (-s ours) am 2b9d34e1: am 73371e58: Merge "Fix gdbclient to work with emulator builds"
...
* commit '88c74baa6aaeb0a8e0813c417b03fbaec151d7e2':
2015-08-27 10:46:56 +00:00
Santos Cordon
25c7016919
am eb0ae402: (-s ours) am 0aafaa70: Add calllog CTS tests.
...
* commit 'eb0ae4024b70a3468890483dfb4a0ee89eed564b':
2015-08-27 10:46:54 +00:00
Benjamin Weiss
bfb523009e
am be0cc8fb: (-s ours) am f3b07d46: am c84455c1: Introduce sample for RoundedBitmapDrawable
...
* commit 'be0cc8fb97782151f3c87550ddc7bd2d2f5779a1':
2015-08-27 10:46:51 +00:00
Trevor Johns
65400b5f38
am 87bea24f: (-s ours) am 4fabcc75: am 0d21ec5c: (-s ours) am 4fe2d033: (-s ours) Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
...
* commit '87bea24f774feb7ac83a561b8ecb6b059ae221f4':
2015-08-27 10:46:49 +00:00
Deepanshu Gupta
2308464796
am 1ecf7f46: am f25696b5: am 5163378d: (-s ours) am f3ddcb27: am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]
...
* commit '1ecf7f4647b0eef14ce9fc8f2819ce66768b76bf':
Update LayoutLib revision number. [DO NOT MERGE]
2015-08-27 04:57:22 +00:00
Yusuf Ozuysal
e98b87f3fb
am c3d6f680: am 04a6dcac: Revert "Add customtabs support lib to extras/android/support/"
...
* commit 'c3d6f6802950a70cd6ed241b67563da3b0f41e99':
Revert "Add customtabs support lib to extras/android/support/"
2015-08-27 04:53:21 +00:00
Deepanshu Gupta
1ecf7f4647
am f25696b5: am 5163378d: (-s ours) am f3ddcb27: am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]
...
* commit 'f25696b53e50e3a2d4be49fc198ebdcecd1d6c0e':
Update LayoutLib revision number. [DO NOT MERGE]
2015-08-27 02:12:11 +00:00
Yusuf Ozuysal
c3d6f68029
am 04a6dcac: Revert "Add customtabs support lib to extras/android/support/"
...
* commit '04a6dcacf0a86b6b0d243a88c8bcf87f24516045':
Revert "Add customtabs support lib to extras/android/support/"
2015-08-27 01:44:05 +00:00
Deepanshu Gupta
f25696b53e
am 5163378d: (-s ours) am f3ddcb27: am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]
...
* commit '5163378d218cdd9e5e7b5db9de7ed37dd8887dd8':
Update LayoutLib revision number. [DO NOT MERGE]
2015-08-27 01:33:07 +00:00
Yusuf Ozuysal
04a6dcacf0
Revert "Add customtabs support lib to extras/android/support/"
...
This reverts commit 53ad2de7f6 .
Change-Id: Ia9831d344e6e0b12c55544b02254daae109f09c5
2015-08-26 23:31:45 +00:00
Deepanshu Gupta
5163378d21
am f3ddcb27: am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]
...
* commit 'f3ddcb279bfdc9618bf0b29a33d6ad188bcd8aff':
Update LayoutLib revision number. [DO NOT MERGE]
2015-08-26 20:17:20 +00:00
Yusuf Ozuysal
9df340b175
am 1c6e1387: am 53ad2de7: Add customtabs support lib to extras/android/support/
...
* commit '1c6e1387a2b8c956fe356557e6ee7e2249778721':
Add customtabs support lib to extras/android/support/
2015-08-26 19:23:55 +00:00
Yusuf Ozuysal
1c6e1387a2
am 53ad2de7: Add customtabs support lib to extras/android/support/
...
* commit '53ad2de7f6677c31eb42dbd117b4857f38fc36f4':
Add customtabs support lib to extras/android/support/
2015-08-26 19:16:20 +00:00
Elliott Hughes
d14b469bdc
am b851cbc2: am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes."
...
* commit 'b851cbc2cd9b6f36a6e5c7f150c82eb0744d573f':
Patch android-21 with aarch64 <sys/user.h> fixes.
2015-08-26 15:47:48 +00:00
Elliott Hughes
b851cbc2cd
am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes."
...
* commit '1a8697f91c7f95477e5e1de4580d5b9e5ea3e6fd':
Patch android-21 with aarch64 <sys/user.h> fixes.
2015-08-26 15:29:20 +00:00
Elliott Hughes
1a8697f91c
Merge "Patch android-21 with aarch64 <sys/user.h> fixes."
2015-08-26 15:22:05 +00:00
Deepanshu Gupta
f3ddcb279b
am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]
...
* commit '844574cb2c69dcd57be9523f0c2c0c3dcc4da867':
Update LayoutLib revision number. [DO NOT MERGE]
2015-08-26 05:50:19 +00:00
Elliott Hughes
2e60272c03
Patch android-21 with aarch64 <sys/user.h> fixes.
...
This makes the files match (AOSP ToT post-M) bionic.
Bug: http://b/23377194
Change-Id: Ie72614612fbe49c4250ca1383d1d224e8bff62dc
2015-08-25 18:43:20 -07:00
Yusuf Ozuysal
53ad2de7f6
Add customtabs support lib to extras/android/support/
...
Currently the only way to get access to customtabs library through
download m2repository and using the aar file whereas all other
support libs are also present in extras/android/support/ with
the corresponding resources and jar file.
This adds the jar and manifest to the corresponding folder to avoid
the confusion to developers.
Change-Id: Id6d71e4071c0725257cadb539cd47230d6727914
2015-08-25 15:46:58 -07:00
Deepanshu Gupta
844574cb2c
Update LayoutLib revision number. [DO NOT MERGE]
...
Change-Id: I5a32442861809dfa8e4b39a232777388f8c082b5
2015-08-25 11:53:39 -07:00
Jae Seo
99ec23c9ed
am 3fb1da70: MediaRouter: Remove an unused member in SampleMediaRouteProvider
...
* commit '3fb1da70efd85a390475a3ea467ce14b4e481236':
MediaRouter: Remove an unused member in SampleMediaRouteProvider
2015-08-25 05:54:11 +00:00
Jae Seo
3fb1da70ef
MediaRouter: Remove an unused member in SampleMediaRouteProvider
...
Change-Id: I9eb7d16a49017697e2586dc1988e4411566d65d4
2015-08-25 14:46:29 +09:00
Jae Seo
dd7c2dc33e
am b26f52f2: MediaRouter: Add a sample for the custom route icon
...
* commit 'b26f52f2c06ee64f4e154f560c93f65982817482':
MediaRouter: Add a sample for the custom route icon
2015-08-25 05:46:20 +00:00
Jae Seo
b26f52f2c0
MediaRouter: Add a sample for the custom route icon
...
Bug: 23116379
Change-Id: Ie744f40584e4f39cf17cd58d238f98059a8a88a3
2015-08-25 13:59:20 +09:00
Jaewan Kim
586256c891
am 327fee84: Merge "MediaRouter: Prevent activity from restarting" into mnc-ub-dev
...
* commit '327fee84b57a902ee35f2dd7c5d2c4e65f790aac':
MediaRouter: Prevent activity from restarting
2015-08-25 01:44:24 +00:00
Jaewan Kim
327fee84b5
Merge "MediaRouter: Prevent activity from restarting" into mnc-ub-dev
2015-08-25 01:40:35 +00:00
Robert Hahn
19888db227
am e6b72719: Added Transitions and minor code clean up
...
* commit 'e6b72719a85a4731673d1d56f7b4f7463f18e249':
Added Transitions and minor code clean up
2015-08-24 18:02:17 +00:00
Robert Hahn
e6b72719a8
Added Transitions and minor code clean up
...
Added support for the DetailView Activity
transition. The DetailView can now be started
from the launcher or the Cards example.
Added support for Browse entrance transition.
Minor code clean up such as renaming
GridExample fragment to GridExampleFragment
and removing unused methods.
Change-Id: Ib1c11af82be5b858960e243acd7f11ce8dbd06f7
2015-08-24 10:51:57 -07:00
Jaewan Kim
5d04bdb493
MediaRouter: Prevent activity from restarting
...
This keeps the playlist for orientation changes.
Bug: 23399327
Change-Id: I89d436a0455190798180ceef3bcb2028eacbf23b
2015-08-24 20:03:45 +09:00
Andreas Gampe
98ad1a7966
am 4cacf112: am 07ddfb0e: Merge "Development/scripts: Add sanitizer dump support to stack"
...
* commit '4cacf1124db6f46a02dcb67cd6d1c3e7fe6daf81':
Development/scripts: Add sanitizer dump support to stack
2015-08-22 00:48:39 +00:00
Andreas Gampe
4cacf1124d
am 07ddfb0e: Merge "Development/scripts: Add sanitizer dump support to stack"
...
* commit '07ddfb0edff3e5b4d5888fafb703a8c253677965':
Development/scripts: Add sanitizer dump support to stack
2015-08-22 00:40:50 +00:00
Andreas Gampe
07ddfb0edf
Merge "Development/scripts: Add sanitizer dump support to stack"
2015-08-22 00:34:13 +00:00
Andreas Gampe
d900d08d81
Development/scripts: Add sanitizer dump support to stack
...
Add trace parsing for sanitizer output. The output is different
from debuggerd output (and we do not have control over it). Use
two separate regexes and factor out the parsing into a method
returning a tuple of data.
Note: as we have no control over the prologue of the dump, we
cannot change it to include information like the ABI. Thus, this
functionality only works in a lunched tree, where the tool
implicitly uses the symbols directory.
Change-Id: Ic1189f4f65cf7728d1baec7055ecb549b0aa5f62
2015-08-21 17:29:47 -07:00
Xavier Ducrohet
e0a754fb44
am 2faa3119: am 9878bf64: Update build tools version to 23.0.1 -- DO NOT MERGE.
...
* commit '2faa3119416f1d06419fdfcf7933490280df3e1b':
Update build tools version to 23.0.1 -- DO NOT MERGE.
2015-08-20 22:09:10 +00:00
Xavier Ducrohet
2faa311941
am 9878bf64: Update build tools version to 23.0.1 -- DO NOT MERGE.
...
* commit '9878bf64b56c52a26acab862c6e1491946569dd8':
Update build tools version to 23.0.1 -- DO NOT MERGE.
2015-08-20 22:01:49 +00:00
Xavier Ducrohet
9878bf64b5
Update build tools version to 23.0.1 -- DO NOT MERGE.
...
Change-Id: I959b1402c0493ac65fd1a3bf7a58f31a808ea234
2015-08-20 13:59:07 -07:00
Trevor Johns
7a937892b9
am 979a6c71: am 81556478: Sync sample prebuilts for mnc-dev
...
* commit '979a6c716c782e5a450d5446184670ca8deeab27':
Sync sample prebuilts for mnc-dev
2015-08-20 17:46:16 +00:00
Trevor Johns
8b02eabef7
am 55dcdfb2: am c8e94bf5: Sync mnc-dev sample prebuilts
...
* commit '55dcdfb2982e50d7d127aec80edd4dc910e6a960':
Sync mnc-dev sample prebuilts
2015-08-20 17:46:14 +00:00
Trevor Johns
0f39e6f7ca
am 7eca3d4c: am a56a6341: Update sample prebuilts to use latest deps
...
* commit '7eca3d4cf54cd4bb670d44dcd6af80306ca25d27':
Update sample prebuilts to use latest deps
2015-08-20 17:46:12 +00:00
Trevor Johns
da1070d177
am 47176947: am 9a9c2ea5: Bump mnc-dev samples package to v3 (DO NOT MERGE)
...
* commit '47176947a3769213fe07507f0674eaf7b2ae6511':
Bump mnc-dev samples package to v3 (DO NOT MERGE)
2015-08-20 17:46:10 +00:00
Trevor Johns
979a6c716c
am 81556478: Sync sample prebuilts for mnc-dev
...
* commit '8155647801c9da4070bc0a044ec73afc126f4b88':
Sync sample prebuilts for mnc-dev
2015-08-20 16:23:15 +00:00
Trevor Johns
55dcdfb298
am c8e94bf5: Sync mnc-dev sample prebuilts
...
* commit 'c8e94bf583adc38c36e968eb00f21a8b8ca70257':
Sync mnc-dev sample prebuilts
2015-08-20 16:23:13 +00:00
Trevor Johns
7eca3d4cf5
am a56a6341: Update sample prebuilts to use latest deps
...
* commit 'a56a6341669e1402c23c9d4e1c24337525189c65':
Update sample prebuilts to use latest deps
2015-08-20 16:23:11 +00:00
Trevor Johns
47176947a3
am 9a9c2ea5: Bump mnc-dev samples package to v3 (DO NOT MERGE)
...
* commit '9a9c2ea5f207e3f59f6ede1b91f46121e41200a5':
Bump mnc-dev samples package to v3 (DO NOT MERGE)
2015-08-20 16:23:09 +00:00
Trevor Johns
1fd18a048f
am e00d9e65: am d95a687e: Sync sample prebuilts for mnc-dev
...
* commit 'e00d9e659c233f74c69f5f3a4520ef28a6e35bde':
Sync sample prebuilts for mnc-dev
2015-08-20 16:17:53 +00:00
Trevor Johns
e00d9e659c
am d95a687e: Sync sample prebuilts for mnc-dev
...
* commit 'd95a687e5a9820f9859997dc733da9a18afb57c2':
Sync sample prebuilts for mnc-dev
2015-08-20 16:10:16 +00:00
Trevor Johns
8155647801
Sync sample prebuilts for mnc-dev
...
Synced to //developers/samples/android commit 57690c2111.
Change-Id: Ie10e7bbcf4fd9dfb4db02b8cffa4e47d88076315
2015-08-19 17:38:27 -07:00
Jae Seo
bdd53d1145
am 7f59e62c: Merge "MediaRouter: Add route groups" into mnc-ub-dev
...
* commit '7f59e62cf6207497dc3c205097e49b451087e231':
MediaRouter: Add route groups
2015-08-19 06:09:49 +00:00
Jae Seo
7f59e62cf6
Merge "MediaRouter: Add route groups" into mnc-ub-dev
2015-08-19 06:06:46 +00:00
Dake Gu
e38afce3d9
am a09fe02d: Revert changes of adding guidedstep fragment in Browse
...
* commit 'a09fe02d59a28e2706e3ca9095c46d9aaa40fe06':
Revert changes of adding guidedstep fragment in Browse
2015-08-18 23:42:24 +00:00