OSDN Git Service
Android Build Merger (Role) [Tue, 19 Jul 2016 21:26:26 +0000 (21:26 +0000)]
Merge "Merge \\"docs: Added two new logos to Auto index page. Merge commit \\'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\\' into manual_merge_b94941d\\" into nyc-dev am:
86e39225a9 am:
b7e80ca81f" into nyc-mr1-dev-plus-aosp
Sreevani Sreejith [Tue, 19 Jul 2016 21:25:51 +0000 (21:25 +0000)]
Merge \\"docs: Added two new logos to Auto index page. Merge commit \\'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\\' into manual_merge_b94941d\\" into nyc-dev am:
86e39225a9
am:
c4e2ae415b
Change-Id: I414e1c4fcd065fc730dca522b22fd73873bf02d2
Sreevani Sreejith [Tue, 19 Jul 2016 21:25:51 +0000 (21:25 +0000)]
Merge \\"docs: Added two new logos to Auto index page. Merge commit \\'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\\' into manual_merge_b94941d\\" into nyc-dev am:
86e39225a9
am:
b7e80ca81f
Change-Id: Idfba53e954b0b4aa584dc80d134a33a06976fa3a
sreevanis [Tue, 19 Jul 2016 21:21:23 +0000 (21:21 +0000)]
Merge \"docs: Added two new logos to Auto index page. Merge commit \'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\' into manual_merge_b94941d\" into nyc-dev
am:
86e39225a9
Change-Id: I204bdc1625d5ee66fabe5a17a551a645f1348506
sreevanis [Tue, 19 Jul 2016 21:21:17 +0000 (21:21 +0000)]
Merge \"docs: Added two new logos to Auto index page. Merge commit \'
b94941d03ee77ed6c0e842683ec8bf5d420298d7\' into manual_merge_b94941d\" into nyc-dev
am:
86e39225a9
Change-Id: Ifa28ee727034ba7f194baf674b058ddc3c1a1278
Sreevani Sreejith [Tue, 19 Jul 2016 21:13:00 +0000 (21:13 +0000)]
Merge "docs: Added two new logos to Auto index page. Merge commit '
b94941d03ee77ed6c0e842683ec8bf5d420298d7' into manual_merge_b94941d" into nyc-dev
Chien-Yu Chen [Tue, 19 Jul 2016 21:12:07 +0000 (21:12 +0000)]
Merge \"ImageReader: Make close thread safe\" into nyc-mr1-dev
am:
2f8bf1f024
Change-Id: I9954f6b7b7ab997391acbe3f16cbce36d9c5de3c
Chien-Yu Chen [Tue, 19 Jul 2016 21:05:35 +0000 (21:05 +0000)]
Merge "ImageReader: Make close thread safe" into nyc-mr1-dev
Jason Monk [Tue, 19 Jul 2016 20:50:01 +0000 (20:50 +0000)]
Merge \\"Don\\'t allow enable/disable of tuner on lockscreen\\" into nyc-dev am:
8933c41b35
am:
b9f06d829a
Change-Id: Ib7fd3f495a1ce0cbc1e225d06ac5bca46453e02e
Jason Monk [Tue, 19 Jul 2016 20:49:57 +0000 (20:49 +0000)]
Merge \\"Pre-setup restrictions\\" into nyc-dev am:
f84c05c360
am:
9220e9dec9
Change-Id: Idc48e080e41d469bfb508b7fe37fd197b2119e90
Jason Monk [Tue, 19 Jul 2016 20:45:23 +0000 (20:45 +0000)]
Merge \\"Don\\'t allow enable/disable of tuner on lockscreen\\" into nyc-dev am:
8933c41b35
am:
50805412c8
Change-Id: If06e1f171f9920f9d23d9b7fa79909b8da5f2173
Jason Monk [Tue, 19 Jul 2016 20:45:20 +0000 (20:45 +0000)]
Merge \\"Pre-setup restrictions\\" into nyc-dev am:
f84c05c360
am:
47d17a4f18
Change-Id: I91a96f403911ffc899c082df0c010ff242848ebb
Jason Monk [Tue, 19 Jul 2016 20:37:28 +0000 (20:37 +0000)]
Merge \"Don\'t allow enable/disable of tuner on lockscreen\" into nyc-dev
am:
8933c41b35
Change-Id: I906016249dfb4667bfcaafde07900eee1d90570b
Jason Monk [Tue, 19 Jul 2016 20:37:22 +0000 (20:37 +0000)]
Merge \"Don\'t allow enable/disable of tuner on lockscreen\" into nyc-dev
am:
8933c41b35
Change-Id: I2e24199ee933ac9d18c97858f27408092c3546e5
Jason Monk [Tue, 19 Jul 2016 20:37:17 +0000 (20:37 +0000)]
Merge \"Pre-setup restrictions\" into nyc-dev
am:
f84c05c360
Change-Id: I116aae1bf052d14e69204ee60c7d65837d5c7590
Jason Monk [Tue, 19 Jul 2016 20:37:15 +0000 (20:37 +0000)]
Merge \"Pre-setup restrictions\" into nyc-dev
am:
f84c05c360
Change-Id: I2902c765eeacdbe05a393b01936572233c783988
sreevanis [Tue, 19 Jul 2016 20:32:30 +0000 (13:32 -0700)]
docs: Added two new logos to Auto index page.
Merge commit '
b94941d03ee77ed6c0e842683ec8bf5d420298d7' into manual_merge_b94941d
Bug:
29625414
Change-Id: Iab1b6d2cdf29fd45fae953626271efc2c4d5635d
Jason Monk [Tue, 19 Jul 2016 20:31:21 +0000 (20:31 +0000)]
Merge "Don't allow enable/disable of tuner on lockscreen" into nyc-dev
Jason Monk [Tue, 19 Jul 2016 20:31:17 +0000 (20:31 +0000)]
Merge "Pre-setup restrictions" into nyc-dev
Julia Reynolds [Tue, 19 Jul 2016 20:11:38 +0000 (20:11 +0000)]
Merge \"Prevent notifications from erroroneously bypassing \'repeat callers\' filter\" into nyc-mr1-dev
am:
9c3d64caef
Change-Id: I5fbe9d0c5da7084cede75aaaa57255844d836661
TreeHugger Robot [Tue, 19 Jul 2016 20:05:42 +0000 (20:05 +0000)]
Merge "Prevent notifications from erroroneously bypassing 'repeat callers' filter" into nyc-mr1-dev
Jason Monk [Tue, 19 Jul 2016 19:45:56 +0000 (19:45 +0000)]
Merge \"QS: Make BT detail be more consistent with Settings\" into nyc-mr1-dev
am:
c357decc4f
Change-Id: I459f16f36789f87c5a178cb96f9948f75029be5c
TreeHugger Robot [Tue, 19 Jul 2016 19:39:32 +0000 (19:39 +0000)]
Merge "QS: Make BT detail be more consistent with Settings" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 19 Jul 2016 19:29:25 +0000 (19:29 +0000)]
Merge "Merge \\"docs: Added call to build to code snippet\\" into nyc-dev am:
581815c652 am:
d1b23d6170" into nyc-mr1-dev-plus-aosp
Eric Schmidt [Tue, 19 Jul 2016 19:29:03 +0000 (19:29 +0000)]
Merge \\"docs: Added call to build to code snippet\\" into nyc-dev am:
581815c652
am:
d1b23d6170
Change-Id: I7ca297d6e46e83fc1e4bcdaa103d542fab04c13f
Eric Schmidt [Tue, 19 Jul 2016 19:27:03 +0000 (19:27 +0000)]
Merge \\"docs: Added call to build to code snippet\\" into nyc-dev am:
581815c652
am:
944572de1e
Change-Id: I6064e72b085c42aba81ce2142f5cccbc1969dca6
Eric Schmidt [Tue, 19 Jul 2016 19:21:39 +0000 (19:21 +0000)]
Merge \"docs: Added call to build to code snippet\" into nyc-dev
am:
581815c652
Change-Id: Idbdb3f1d0429481bcb26b912ead3b5f9e8fb917f
Geoffrey Pitsch [Tue, 19 Jul 2016 19:13:05 +0000 (19:13 +0000)]
Merge \"Play boot sound on the System stream.\" into nyc-mr1-dev
am:
7d2f4cc750
Change-Id: I83cea2be8c0f4700eb9f1808b1e713e08b1f2ef3
Geoffrey Pitsch [Tue, 19 Jul 2016 19:06:44 +0000 (19:06 +0000)]
Merge "Play boot sound on the System stream." into nyc-mr1-dev
Eric Schmidt [Tue, 19 Jul 2016 19:03:16 +0000 (19:03 +0000)]
Merge \"docs: Added call to build to code snippet\" into nyc-dev
am:
581815c652
Change-Id: Ic344ede7dafc95ab78e29724e1e6cc58115acc7c
Michael Kwan [Tue, 19 Jul 2016 18:57:11 +0000 (18:57 +0000)]
Merge \"Fix padding on round devices for AlertDialogs.\" into nyc-mr1-dev
am:
0cd4addd36
Change-Id: I5287b5cae2d18edc5dc2c5fbc2998c63fadbe583
Eric Schmidt [Tue, 19 Jul 2016 18:56:09 +0000 (18:56 +0000)]
Merge "docs: Added call to build to code snippet" into nyc-dev
TreeHugger Robot [Tue, 19 Jul 2016 18:48:26 +0000 (18:48 +0000)]
Merge "Fix padding on round devices for AlertDialogs." into nyc-mr1-dev
Android Build Merger (Role) [Tue, 19 Jul 2016 18:48:18 +0000 (18:48 +0000)]
Merge "Merge \\"docs: Late-breaking Behavior Changes addition for N Preview 5\\" into nyc-dev am:
34d488b831 am:
626f9b0632" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Tue, 19 Jul 2016 18:47:52 +0000 (18:47 +0000)]
Merge \\"docs: Late-breaking Behavior Changes addition for N Preview 5\\" into nyc-dev am:
34d488b831
am:
626f9b0632
Change-Id: Ib01f47507444ddd0a1f4cadc0b3d38fcb21bb161
Andrew Solovay [Tue, 19 Jul 2016 18:46:34 +0000 (18:46 +0000)]
Merge \\"docs: Late-breaking Behavior Changes addition for N Preview 5\\" into nyc-dev am:
34d488b831
am:
98a029f826
Change-Id: I7b91f368975cb5591890def4339690fde83017e3
Andrew Solovay [Tue, 19 Jul 2016 18:39:24 +0000 (18:39 +0000)]
Merge \"docs: Late-breaking Behavior Changes addition for N Preview 5\" into nyc-dev
am:
34d488b831
Change-Id: I3e1ec736dc753d56c515246e5a09f4679d14c296
Andrew Solovay [Tue, 19 Jul 2016 18:38:55 +0000 (18:38 +0000)]
Merge \"docs: Late-breaking Behavior Changes addition for N Preview 5\" into nyc-dev
am:
34d488b831
Change-Id: I25e914798ce778556fad4f2d0c97cb7175111892
Andrew Solovay [Tue, 19 Jul 2016 18:34:13 +0000 (18:34 +0000)]
Merge "docs: Late-breaking Behavior Changes addition for N Preview 5" into nyc-dev
Yuichi Biwa [Tue, 19 Jul 2016 18:33:40 +0000 (18:33 +0000)]
Merge \"ChooserActivity: Cannot start app that the icon overflows the layout\" into nyc-mr1-dev
am:
586f23c14b
Change-Id: Ie6abdf3303e9f91ae474aca112e39576685d0e5d
TreeHugger Robot [Tue, 19 Jul 2016 18:29:09 +0000 (18:29 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-mr1-dev
Jason Monk [Tue, 19 Jul 2016 18:13:37 +0000 (14:13 -0400)]
QS: Make BT detail be more consistent with Settings
- Show turning on as on
- Disable switch when in a turning on/off state
Change-Id: I55f977808d1b881f6dc27192dcc2e907b0576447
Fixes:
29237638
Android Build Merger (Role) [Tue, 19 Jul 2016 17:58:59 +0000 (17:58 +0000)]
Merge "Merge \\"docs: Updated images and content on \\"Google Sign-In\\" page.\\" into nyc-dev am:
c13b84d38c am:
6e3bbf06a0" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Tue, 19 Jul 2016 17:58:33 +0000 (17:58 +0000)]
Merge \\"docs: Updated images and content on \\"Google Sign-In\\" page.\\" into nyc-dev am:
c13b84d38c
am:
6e3bbf06a0
Change-Id: If64fbbcf83910c7f1471470ac3fbbccd9863daa4
Kevin Hufnagle [Tue, 19 Jul 2016 17:57:09 +0000 (17:57 +0000)]
Merge \\"docs: Updated images and content on \\"Google Sign-In\\" page.\\" into nyc-dev am:
c13b84d38c
am:
012d597a92
Change-Id: Ibe16ba5c67137a55cd501434ee3e35e3bba06f3f
Erik Wolsheimer [Tue, 19 Jul 2016 17:57:06 +0000 (17:57 +0000)]
Merge \"Fix a broken case of AndroidKeyStoreProvider error logging\" into nyc-mr1-dev
am:
45b8216d33
Change-Id: I774014fc4922f10a5fd0b23239b0a5710a4f3f3c
Kevin Hufnagle [Tue, 19 Jul 2016 17:53:25 +0000 (17:53 +0000)]
Merge \"docs: Updated images and content on \"Google Sign-In\" page.\" into nyc-dev
am:
c13b84d38c
Change-Id: I61037c2a2aeb7def57d3280555bda39b1d7bb223
Kevin Hufnagle [Tue, 19 Jul 2016 17:52:08 +0000 (17:52 +0000)]
Merge \"docs: Updated images and content on \"Google Sign-In\" page.\" into nyc-dev
am:
c13b84d38c
Change-Id: Ie9b2bc63ebfefe72cc48ba331e28d4792096c48f
ewol [Tue, 19 Jul 2016 17:49:27 +0000 (17:49 +0000)]
Merge "Fix a broken case of AndroidKeyStoreProvider error logging" into nyc-mr1-dev
Kevin Hufnagle [Tue, 19 Jul 2016 17:41:51 +0000 (17:41 +0000)]
Merge "docs: Updated images and content on "Google Sign-In" page." into nyc-dev
Christopher Tate [Tue, 19 Jul 2016 17:37:02 +0000 (17:37 +0000)]
Merge \"Back up wallpapers via staged copies, not hard links\" into nyc-mr1-dev
am:
47f73c4733
Change-Id: Ibfd67eb57fdbd578bb0154498e6fc1ef13738c9c
Julia Reynolds [Tue, 14 Jun 2016 12:31:03 +0000 (08:31 -0400)]
Prevent notifications from erroroneously bypassing 'repeat callers' filter
1. Dialer uses a hidden api to check 'is repeat caller' that has side
effects. Update to use a method without side effects
2. Delay the storage of person information until the notification is
canceled, so ranking updates and notification updates don't bypass the
filter. Note, this means that someone calling twice at overlapping
times (?!) wouldn't get through the filter.
Fixes:
29184211
Change-Id: I53ce402a0ed6f5df6f8265d571d401778dacebd3
Chris Tate [Tue, 19 Jul 2016 17:29:31 +0000 (17:29 +0000)]
Merge "Back up wallpapers via staged copies, not hard links" into nyc-mr1-dev
Wei Liu [Tue, 19 Jul 2016 17:22:30 +0000 (17:22 +0000)]
Merge \"Use the Shell app to show the bugreport notification on Wear.\" into nyc-mr1-dev
am:
1dfbf794b5
Change-Id: Ibb3310be1330d238059e4f70aa26763731b19a30
Ruben Brunk [Tue, 19 Jul 2016 17:22:26 +0000 (17:22 +0000)]
Merge \"Return empty set instead of null when user is not set.\" into nyc-mr1-dev
am:
4c724f16af
Change-Id: I10b0c5dce363b16cf89e019d4c1120588fd1a166
Adrian Roos [Tue, 19 Jul 2016 17:22:21 +0000 (17:22 +0000)]
Merge \"AppErrors: Fix bad flags printing in dropbox crash reports\" into nyc-mr1-dev
am:
b4addbc282
Change-Id: If9ac62f69406845f3a204393149510c9fcfa53dc
sreevanis [Tue, 19 Jul 2016 17:21:55 +0000 (17:21 +0000)]
docs: Added two new logos to Auto index page. borgward and lada logos.
am:
f8710dd62f
Change-Id: I93ff55c7fce479be8d67d726b004ac9a5bc964e7
Michael Kwan [Tue, 19 Jul 2016 16:48:45 +0000 (09:48 -0700)]
Fix padding on round devices for AlertDialogs.
Bug:
27482353
Change-Id: Ic9ee4abe84f9172db64dba398af2c0058921fa3f
Wei Liu [Tue, 19 Jul 2016 17:16:22 +0000 (17:16 +0000)]
Merge "Use the Shell app to show the bugreport notification on Wear." into nyc-mr1-dev
Ruben Brunk [Tue, 19 Jul 2016 17:13:41 +0000 (17:13 +0000)]
Merge "Return empty set instead of null when user is not set." into nyc-mr1-dev
Adrian Roos [Tue, 19 Jul 2016 17:10:02 +0000 (17:10 +0000)]
Merge "AppErrors: Fix bad flags printing in dropbox crash reports" into nyc-mr1-dev
sreevanis [Mon, 18 Jul 2016 19:46:59 +0000 (12:46 -0700)]
docs: Added two new logos to Auto index page.
borgward and lada logos.
Bug:
29625414
Change-Id: Idc2e78ad4d3ddab3ce4af9bd903264c9ba8a7664
Yuichi Biwa [Mon, 30 Nov 2015 05:43:34 +0000 (14:43 +0900)]
ChooserActivity: Cannot start app that the icon overflows the layout
Symptom:
When sharing an image from Album, ChooserActivity can be shown.
But then the app to be located to the bottom part of the list may not
be started even if user tap it.
Root cause:
ChooserActivity uses ResolverDrawerLayout. And ResolverDrawerLayout
can display only some items on the list (known as "Collapse mode").
When the item clipping along the bottom edge is tapped by the user,
ResolverDrawerLayout tries to expand the list and scroll it to a
better position, instead of starting an application.
In this problem case, ResolverDrawerLayout continues to try to expand
the list whenever tapping, so an application will never start.
Solution:
Change a condition so that mOpenOnClick becomes true only when the list
has been collapsed (mCollapseOffset > 0).
Bug:
30153542
Change-Id: I576fb6c8b6a91d79c1e0d46d069146779f4dbd17
Jason Monk [Tue, 19 Jul 2016 16:39:58 +0000 (12:39 -0400)]
Don't allow enable/disable of tuner on lockscreen
Change-Id: Id9748ea39a8fa03b67d3fa6f91da530dd5cf9409
Fixes:
30107438
Nicolas Prevot [Tue, 19 Jul 2016 16:15:27 +0000 (16:15 +0000)]
Merge \"Don\'t append userIds for the current user\'s clipData uris.\" into nyc-mr1-dev
am:
e723ed8b51
Change-Id: Idf3bf3c6baea706a15df5e68c50d79723a100d9f
Nicolas Prévot [Tue, 19 Jul 2016 16:06:43 +0000 (16:06 +0000)]
Merge "Don't append userIds for the current user's clipData uris." into nyc-mr1-dev
Christopher Wiley [Tue, 19 Jul 2016 16:02:30 +0000 (16:02 +0000)]
Merge \"TetherUtil: Use ConnectivityManager for tethering\" into nyc-mr1-dev
am:
fb0ec9de84
Change-Id: I9a707fdefe40dce1499024375de732515e01bcac
TreeHugger Robot [Tue, 19 Jul 2016 15:55:30 +0000 (15:55 +0000)]
Merge "TetherUtil: Use ConnectivityManager for tethering" into nyc-mr1-dev
Erik Kline [Tue, 19 Jul 2016 15:25:16 +0000 (15:25 +0000)]
Merge \"More correctly close RA daemon socket.\" into nyc-mr1-dev
am:
09d4f4fda4
Change-Id: I69e0bbde197af0e0021ae76c00d730f6b57d19b1
TreeHugger Robot [Tue, 19 Jul 2016 15:20:11 +0000 (15:20 +0000)]
Merge "More correctly close RA daemon socket." into nyc-mr1-dev
Jason Monk [Tue, 19 Jul 2016 14:39:14 +0000 (14:39 +0000)]
Merge \"Neko: Sort the kitties\" into nyc-mr1-dev
am:
7959250318
Change-Id: I80a7aece22ccd29ea8e3fee19f217958da4e1698
Jason Monk [Tue, 19 Jul 2016 14:30:03 +0000 (14:30 +0000)]
Merge "Neko: Sort the kitties" into nyc-mr1-dev
Erik Kline [Tue, 19 Jul 2016 08:37:27 +0000 (17:37 +0900)]
More correctly close RA daemon socket.
Bug:
9580643
Bug:
30190913
Change-Id: I34e34624da09957d96fee38c3f2005e23eb1bee5
Bill Yi [Tue, 19 Jul 2016 09:53:11 +0000 (09:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
862f109dd5 -s ours
Change-Id: If842604b9a7f29fa0896ab1c7921fed6fa4b6990
Bill Yi [Tue, 19 Jul 2016 09:53:07 +0000 (09:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
5fa976b741 -s ours
Change-Id: Ifa08ba7af9b6ffd58c95cdc1bbc40638b8433748
TreeHugger Robot [Tue, 19 Jul 2016 09:46:27 +0000 (09:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 19 Jul 2016 09:45:10 +0000 (09:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 19 Jul 2016 06:10:21 +0000 (23:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b32e941e68f7fd5e2fdd3567ac62388b2ae07c8
Auto-generated-cl: translation import
Bill Yi [Tue, 19 Jul 2016 05:55:56 +0000 (22:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifee6c2d6fb55da91f5544c6fe69b233bffc70b4e
Auto-generated-cl: translation import
Kevin Hufnagle [Fri, 1 Jul 2016 00:22:35 +0000 (17:22 -0700)]
docs: Updated images and content on "Google Sign-In" page.
Removed 3 outdated images and replaced with a banner image. Also
updated content layout to fill the page appropriately given new
(single) image.
Bug:
26243119
Change-Id: I4bd71e2a22175ad8fe3bf592e80ff558877f0b11
Android Build Merger (Role) [Tue, 19 Jul 2016 03:19:37 +0000 (03:19 +0000)]
Merge "Merge \\"docs: Added metadata to display AdMob Udacity resource card\\" into nyc-dev am:
b79aac7a0e am:
8cb020227d" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 19 Jul 2016 03:19:28 +0000 (03:19 +0000)]
Merge "Merge \\"docs: Added metadata to display AdMob Udacity resource card\\" into nyc-dev am:
b79aac7a0e am:
aa63aab59e" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 19 Jul 2016 03:19:21 +0000 (03:19 +0000)]
Merge "Merge \\"docs: Edited phrasing for \\"orderId is blank with test IAP purchases\\"\\" into nyc-dev am:
e25fd0eda8 am:
0ff26ec64e" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Tue, 19 Jul 2016 03:18:39 +0000 (03:18 +0000)]
Merge \\"docs: Added metadata to display AdMob Udacity resource card\\" into nyc-dev am:
b79aac7a0e
am:
8cb020227d
Change-Id: Iac30188cb146eb77eae58663b7fde74d68fdf6f9
Kevin Hufnagle [Tue, 19 Jul 2016 03:18:36 +0000 (03:18 +0000)]
Merge \\"docs: Added metadata to display AdMob Udacity resource card\\" into nyc-dev am:
b79aac7a0e
am:
aa63aab59e
Change-Id: I822dbc5660e102156be19b5f59ba846dd2bc3078
Kevin Hufnagle [Tue, 19 Jul 2016 03:18:34 +0000 (03:18 +0000)]
Merge \\"docs: Edited phrasing for \\"orderId is blank with test IAP purchases\\"\\" into nyc-dev am:
e25fd0eda8
am:
0ff26ec64e
Change-Id: I3199ac3b1b2a41c3a0c399033bb6bbd5188b18da
Kevin Hufnagle [Tue, 19 Jul 2016 03:18:33 +0000 (03:18 +0000)]
Merge \\"docs: Edited phrasing for \\"orderId is blank with test IAP purchases\\"\\" into nyc-dev am:
e25fd0eda8
am:
eb2835329f
Change-Id: I3d70763a6370a138e069fd1b17687b29d070e5ba
Kevin Hufnagle [Tue, 19 Jul 2016 03:13:27 +0000 (03:13 +0000)]
Merge \"docs: Added metadata to display AdMob Udacity resource card\" into nyc-dev
am:
b79aac7a0e
Change-Id: If2e96ea7656a43a2f568f599378d1ae74fb25f0a
Kevin Hufnagle [Tue, 19 Jul 2016 03:13:18 +0000 (03:13 +0000)]
Merge \"docs: Edited phrasing for \"orderId is blank with test IAP purchases\"\" into nyc-dev
am:
e25fd0eda8
Change-Id: Ia4152d80b5701c5108aec6f399d4d97a3ef98473
Kevin Hufnagle [Tue, 19 Jul 2016 03:13:10 +0000 (03:13 +0000)]
Merge \"docs: Added metadata to display AdMob Udacity resource card\" into nyc-dev
am:
b79aac7a0e
Change-Id: I9b41c494aa7d26f60a6856ddf877faf127dc70e8
Kevin Hufnagle [Tue, 19 Jul 2016 03:13:08 +0000 (03:13 +0000)]
Merge \"docs: Edited phrasing for \"orderId is blank with test IAP purchases\"\" into nyc-dev
am:
e25fd0eda8
Change-Id: I0e3d131c0c0a259201fed4aa0209231a5cec000e
Kevin Hufnagle [Tue, 19 Jul 2016 03:05:35 +0000 (03:05 +0000)]
Merge "docs: Added metadata to display AdMob Udacity resource card" into nyc-dev
Kevin Hufnagle [Tue, 19 Jul 2016 03:05:08 +0000 (03:05 +0000)]
Merge "docs: Edited phrasing for "orderId is blank with test IAP purchases"" into nyc-dev
Eino-Ville Talvala [Mon, 18 Jul 2016 22:01:56 +0000 (15:01 -0700)]
Fix build: Remove unused debug flag
Change-Id: I929df7018aba8ac7677aa30c17bd842599697ac7
(cherry picked from commit
bc0580db5f42d3525609d5bfef16ab8e3b43b548)
Andrew Sapperstein [Tue, 19 Jul 2016 02:11:05 +0000 (02:11 +0000)]
Merge \"Update bugreport dialog to DeviceDefault theme.\" into nyc-mr1-dev
am:
878bd5103e
Change-Id: I918da483da287b36f49b103a5823f5ca81b2f4c0
Justin Klaassen [Tue, 19 Jul 2016 02:11:00 +0000 (02:11 +0000)]
Merge \"Cleanup TwilightService\" into nyc-mr1-dev
am:
e5aeca3dc9
Change-Id: Iac61d988c3432b8f78eb7d06dd3bb8d706fec621
TreeHugger Robot [Tue, 19 Jul 2016 02:03:53 +0000 (02:03 +0000)]
Merge "Update bugreport dialog to DeviceDefault theme." into nyc-mr1-dev
TreeHugger Robot [Tue, 19 Jul 2016 02:02:06 +0000 (02:02 +0000)]
Merge "Cleanup TwilightService" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 19 Jul 2016 01:53:15 +0000 (01:53 +0000)]
Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
8dbf0b5558 am:
3c979c6aa6 am:
710605dccf -s ours am:
3900104379 -s ours am:
6e0cedcaf6 am:
aa0ad336b6 am:
407bb6ad53 -s ours am:
3e4c8a96fa am:
a1f106b558 am:
9e48fa5de1 am:
249acab988 -s ours am:
aa93e8571f am:
e6c39fb5b3" into nyc-mr1-dev-plus-aosp
Sungsoo Lim [Tue, 19 Jul 2016 01:52:43 +0000 (01:52 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
8dbf0b5558 am:
3c979c6aa6 am:
710605dccf -s ours am:
3900104379 -s ours am:
6e0cedcaf6 am:
aa0ad336b6 am:
407bb6ad53 -s ours am:
3e4c8a96fa am:
a1f106b558 am:
9e48fa5de1 am:
249acab988 -s ours am:
aa93e8571f
am:
e6c39fb5b3
Change-Id: Ic33d6605590b86aa3d9de45743439afa940d73cb