Wale Ogunwale
4db4c252f1
Merge "Merge "Protect against NPE while to updating service connection activities." into nyc-dev am: cef12198a7 am: 06fac4f77b" into nyc-mr1-dev-plus-aosp
...
am: 6e5260f24f
2016-05-27 22:13:49 +00:00
Rob Carr
46bbf358c1
Merge "Merge "Ensure surfaces only resize during relayout." into nyc-dev am: 58f1167ecf am: c67c7c0799" into nyc-mr1-dev-plus-aosp
...
am: 61903f9151
2016-05-27 22:11:50 +00:00
Daniel Sandler
6d548fe72f
Merge "Merge "Time to #NameAndroidN!" into nyc-dev am: 45caebe035 am: 82aba559fa" into nyc-mr1-dev-plus-aosp
...
am: d065fe5be5
2016-05-27 22:11:48 +00:00
Jeff Sharkey
2ccbbff6f6
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee899397 am: ec298b1567" into nyc-mr1-dev-plus-aosp
...
am: d5b17b2688
2016-05-27 22:11:46 +00:00
Jeff Sharkey
8b6336cc3d
Merge "Merge "Careful process validation for unaware providers." into nyc-dev am: 678dba737b am: 2efd671e48" into nyc-mr1-dev-plus-aosp
...
am: a3b87c5d16
2016-05-27 22:11:44 +00:00
Winson
fcdd9e72f2
Merge "Defer calling the stack task removed callbacks. am: 6c8217ab30 am: d5fada7253" into nyc-mr1-dev-plus-aosp
...
am: 19e8f51d7e
2016-05-27 22:11:42 +00:00
Doris Liu
3c85983996
Add more doc for Object animators defined with a single value
...
Bug: 28104516
Change-Id: I181b2817ceda5dfaf87e12c81b21e7d0d2f002fc
2016-05-27 15:08:46 -07:00
Adrian Roos
ca89f7b69f
Merge "Change app crash dialog strings" into nyc-dev
...
am: a7d66aa6b8
2016-05-27 22:08:23 +00:00
Adrian Roos
20962d345a
Merge "Simplify crash dialog" into nyc-dev
...
am: 9764fea483
2016-05-27 22:08:15 +00:00
Adrian Roos
d70126ec78
Merge "Fix bad one-line MessagingStyle" into nyc-dev
...
am: 5dbb9ff674
2016-05-27 22:08:06 +00:00
Adrian Roos
85e60d203e
Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev
...
am: 2c69d1ecae
2016-05-27 22:07:56 +00:00
Adrian Roos
a7d66aa6b8
Merge "Change app crash dialog strings" into nyc-dev
2016-05-27 22:03:22 +00:00
Jeff Sharkey
d355ff07a5
Merge changes from topic \'am-e885a22f20324bb0b94c97a807186535\' into nyc-mr1-dev-plus-aosp
...
am: 268b04e160
2016-05-27 22:03:12 +00:00
Eric Schmidt
a4f8847af4
Merge "Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am: 8e08dbe8f8 am: 400aed3556 am: 28bdf2907a am: 26ae893c03" into nyc-mr1-dev-plus-aosp
...
am: 04e20d3805
2016-05-27 22:03:05 +00:00
Garfield Tan
6402be9575
Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029bff am: f846d8518b" into nyc-mr1-dev-plus-aosp
...
am: f4e1c42240
2016-05-27 22:02:59 +00:00
Robin Lee
d4f7655ccc
Merge "Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c801 am: 8d27936438" into nyc-mr1-dev-plus-aosp
...
am: 5af6e7d4b5
2016-05-27 22:02:51 +00:00
Adrian Roos
9764fea483
Merge "Simplify crash dialog" into nyc-dev
2016-05-27 22:02:45 +00:00
Jorim Jaggi
70d7b0aa84
Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765ca3 am: 03d0a3aeff" into nyc-mr1-dev-plus-aosp
...
am: 3b5aac257b
2016-05-27 22:02:42 +00:00
Adrian Roos
5dbb9ff674
Merge "Fix bad one-line MessagingStyle" into nyc-dev
2016-05-27 22:02:38 +00:00
Adrian Roos
2c69d1ecae
Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev
2016-05-27 22:02:14 +00:00
Akshay Thakker
bae9b4901a
Merge "Merge "Finalize resource IDs for N." into nyc-dev am: 7bbab7e440 am: c37fb8aa6e" into nyc-mr1-dev-plus-aosp
...
am: e6c133249b
2016-05-27 21:59:08 +00:00
Hang Yin
39aafafa9a
Code Patch for camera preview switch tests
...
This cl will fix the bug: b/28982885. It enables Raw10 Size Array
only when the device support Raw10.
Change-Id: I6a7a9d47708017f71c47fb5bbb15f3e98b555af4
2016-05-27 14:56:14 -07:00
Hemal Patel
2e63ef3cac
Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 am: 202017dcbf
...
am: 8d8718fc53
2016-05-27 21:48:39 +00:00
Hemal Patel
6501ac3bf9
Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51
...
am: 2b9497069d
2016-05-27 21:48:36 +00:00
Hemal Patel
3921ba2f61
Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev
...
am: d63315e535
2016-05-27 21:45:52 +00:00
Michael Wright
7eb543ef2c
Merge "Revert "Finalize resource IDs for N."" into nyc-dev
...
am: 82a8c5f246
2016-05-27 21:45:48 +00:00
Hemal Patel
8d8718fc53
Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43
...
am: 202017dcbf
2016-05-27 21:45:46 +00:00
Hemal Patel
2b9497069d
Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378
...
am: 7a62915c51
2016-05-27 21:45:39 +00:00
Android Build Merger (Role)
d63315e535
Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev
2016-05-27 21:42:25 +00:00
Hemal Patel
5c1cd3ec6c
Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378
...
am: 7ff4ee303b
2016-05-27 21:41:57 +00:00
Hemal Patel
202017dcbf
Merge "Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub." into mnc-io-docs
...
am: 50f57d1d63
2016-05-27 21:41:48 +00:00
Hemal Patel
7a62915c51
Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs
...
am: 9dfa75ef43
2016-05-27 21:41:43 +00:00
Akshay Thakker
82a8c5f246
Merge "Revert "Finalize resource IDs for N."" into nyc-dev
2016-05-27 21:41:26 +00:00
Ian Rogers
d73ff581f3
Fix two confusing naming issues
...
android.R.string.yes is not "Yes" but "OK"; prefer android.R.string.ok for clarity
android.R.string.no is not "No" but "Cancel"; prefer android.R.string.cancel for clarity
Found by Error Prone.
Bug: 27723540
Change-Id: Ia6f58a7e7543ad1cc4e4722de8d095d1de8df034
2016-05-27 14:40:59 -07:00
Android Build Merger (Role)
696bd0e388
Merge "Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev am: bf932b0067 am: 447e93dffc" into nyc-mr1-dev-plus-aosp
2016-05-27 21:38:19 +00:00
Chris Tate
0a48c2c8d3
Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev am: bf932b0067
...
am: 447e93dffc
2016-05-27 21:37:57 +00:00
Chris Tate
b12e4e421f
Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev am: bf932b0067
...
am: 64613753d6
2016-05-27 21:37:53 +00:00
Hemal Patel
7ff4ee303b
Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs
...
am: d09caa1378
2016-05-27 21:37:15 +00:00
Android Build Merger (Role)
ffac575150
Merge "Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev am: e88f60b8bb am: 7aaf3aea00" into nyc-mr1-dev-plus-aosp
2016-05-27 21:34:11 +00:00
Android Build Merger (Role)
e6446f90d1
Merge "Merge "Notification: Fix bug with sliding action list" into nyc-dev am: 06fe24341c am: 389c4e67e9" into nyc-mr1-dev-plus-aosp
2016-05-27 21:34:01 +00:00
Android Build Merger (Role)
f6753c8e7d
Merge "Merge "AlarmManagerService: remove legacy /dev/alarm support" am: 1f336bb051 am: 2c4b276df4 am: cac03c5cdf" into nyc-mr1-dev-plus-aosp
2016-05-27 21:33:50 +00:00
Adrian Roos
3e00cae14e
Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev am: e88f60b8bb
...
am: 7aaf3aea00
2016-05-27 21:33:16 +00:00
Adrian Roos
1ad9fa08fe
Merge "Notification: Fix bug with sliding action list" into nyc-dev am: 06fe24341c
...
am: 389c4e67e9
2016-05-27 21:33:05 +00:00
Christopher Tate
447e93dffc
Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev
...
am: bf932b0067
2016-05-27 21:33:04 +00:00
Greg Hackmann
be120aad74
Merge "AlarmManagerService: remove legacy /dev/alarm support" am: 1f336bb051 am: 2c4b276df4
...
am: cac03c5cdf
2016-05-27 21:32:55 +00:00
Christopher Tate
64613753d6
Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev
...
am: bf932b0067
2016-05-27 21:32:49 +00:00
Hemal Patel
50f57d1d63
Merge "Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub." into mnc-io-docs
2016-05-27 21:32:25 +00:00
Hemal Patel
9dfa75ef43
Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs
2016-05-27 21:32:05 +00:00
Hemal Patel
d09caa1378
Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs
2016-05-27 21:31:24 +00:00
Ian Rogers
a7f834f1ce
Fix SuppressWarnings typo.
...
As Error Prone states:
Suppressing "deprecated" is probably a typo for "deprecation"
Bug: 27723540
Change-Id: Iedc8ef3b876f5238cc0e2d89d57138eafd5bf91f
2016-05-27 14:31:19 -07:00
