OSDN Git Service
Mihai Nita [Thu, 16 Jun 2016 00:37:54 +0000 (00:37 +0000)]
Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am:
c8c9afeacb
Change-Id: Ib9d44296bbb851940a0da0a9a6234f2023dfef25
Mihai Niță [Thu, 16 Jun 2016 00:28:35 +0000 (00:28 +0000)]
Merge "Fix for NullPointerException in SuggestedLocaleAdapter" into nyc-dev
Amith Yamasani [Thu, 16 Jun 2016 00:24:17 +0000 (00:24 +0000)]
Merge \"More thorough cleansing of expired users\" into nyc-dev
am:
4f2b1b455e
Change-Id: Ia5388c84b89cdabefe666b483cebe40066e4d26a
Amith Yamasani [Thu, 16 Jun 2016 00:14:57 +0000 (00:14 +0000)]
Merge "More thorough cleansing of expired users" into nyc-dev
Mihai Nita [Wed, 15 Jun 2016 23:34:50 +0000 (16:34 -0700)]
Fix for NullPointerException in SuggestedLocaleAdapter
Bug:
28748150
Change-Id: Ide2d176d3bc0bb7529bf831b553db3ade37ddb69
Mady Mellor [Wed, 15 Jun 2016 23:27:41 +0000 (23:27 +0000)]
Merge \"Fixes issue with group backgrounds when animating to keyguard\" into nyc-dev
am:
8363980d45
Change-Id: Iee12dc78f65a0e4acb09f513fd9578f28f7a5e2e
Mady Mellor [Wed, 15 Jun 2016 23:20:22 +0000 (23:20 +0000)]
Merge "Fixes issue with group backgrounds when animating to keyguard" into nyc-dev
Bert McMeen [Wed, 15 Jun 2016 23:13:31 +0000 (23:13 +0000)]
Merge \\\"Docs: A removal from docs of an obsolete watch face permission\\\" into mnc-io-docs am:
9011149e19 am:
7250594f04
am:
0caf0b7259
Change-Id: I1fb1c058b95de1786dd4484a9bde085c522d2af5
Bert McMeen [Wed, 15 Jun 2016 23:08:28 +0000 (23:08 +0000)]
Merge \\"Docs: A removal from docs of an obsolete watch face permission\\" into mnc-io-docs am:
9011149e19
am:
7250594f04
Change-Id: I486c9ee933a6ed64d90013cf9964e7106713dde8
Bert McMeen [Wed, 15 Jun 2016 23:03:13 +0000 (23:03 +0000)]
Merge \"Docs: A removal from docs of an obsolete watch face permission\" into mnc-io-docs
am:
9011149e19
Change-Id: If34c51a5c2f8b28612c3526ca40cfce5a9a4a140
Bert McMeen [Wed, 15 Jun 2016 22:57:57 +0000 (22:57 +0000)]
Merge "Docs: A removal from docs of an obsolete watch face permission" into mnc-io-docs
Winson [Wed, 15 Jun 2016 22:57:30 +0000 (22:57 +0000)]
Merge \"Fixing issue with screen pinning screen not showing for secondary users.\" into nyc-dev
am:
9a75ed7ab5
Change-Id: I4b7de84af1cf78a8871fccd555e27d4997cc21a2
TreeHugger Robot [Wed, 15 Jun 2016 22:48:53 +0000 (22:48 +0000)]
Merge "Fixing issue with screen pinning screen not showing for secondary users." into nyc-dev
Brad Ebinger [Wed, 15 Jun 2016 22:44:46 +0000 (22:44 +0000)]
Merge \"Handle Concurrency issues in Connection\" into nyc-dev
am:
df41725e53
Change-Id: I67aa42350cf8ec3e998f42a7856e19ac887a5553
Adam Lesinski [Wed, 15 Jun 2016 22:44:43 +0000 (22:44 +0000)]
Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
am:
464bda8a2b
Change-Id: I352c56482aca030efab49ca39301679b51e44e05
Brad Ebinger [Wed, 15 Jun 2016 22:37:44 +0000 (22:37 +0000)]
Merge "Handle Concurrency issues in Connection" into nyc-dev
Adam Lesinski [Wed, 15 Jun 2016 22:35:25 +0000 (22:35 +0000)]
Merge "ResourcesManager: Allow managed addition of library asset paths" into nyc-dev
Andrew Solovay [Wed, 15 Jun 2016 21:42:20 +0000 (21:42 +0000)]
Merge \"docs: Added AfW item to DP4 \"Behavior Changes\" page\" into nyc-dev
am:
8e8fb7dda0
Change-Id: I9533642e3685f70351e46e29b8503569ae25dc50
TreeHugger Robot [Wed, 15 Jun 2016 21:36:02 +0000 (21:36 +0000)]
Merge "docs: Added AfW item to DP4 "Behavior Changes" page" into nyc-dev
Android Build Merger (Role) [Wed, 15 Jun 2016 21:22:23 +0000 (21:22 +0000)]
Merge "Merge \\"Delete simple reduction implementation.\\" am:
e8909dc0f4 am:
403aa6e3ec" into nyc-dev-plus-aosp
David Gross [Wed, 15 Jun 2016 21:21:16 +0000 (21:21 +0000)]
Merge \\"Delete simple reduction implementation.\\" am:
e8909dc0f4
am:
403aa6e3ec
Change-Id: I56d6d5806c064fa22b969b53dc2e7028f51d78cc
Brian Duddie [Wed, 15 Jun 2016 21:19:18 +0000 (21:19 +0000)]
Merge \"Send VR mode notification to AR app on context hub\" into nyc-dev
am:
9a31e8be48
Change-Id: I2ca21c574b86544ddf597290670ecea4a004e4d6
Richard Ho [Wed, 15 Jun 2016 21:19:08 +0000 (21:19 +0000)]
Merge \"added null check in doInBackground and if null, properly intializes variables.\" into nyc-dev
am:
07a375186e
Change-Id: I5f42789366c96386f7870d2b38c7530cd2bac81d
David Gross [Wed, 15 Jun 2016 21:11:19 +0000 (21:11 +0000)]
Merge \"Delete simple reduction implementation.\"
am:
e8909dc0f4
Change-Id: I76f07b8fc893ac8b67b131b84e34594b0fd3d9b1
TreeHugger Robot [Wed, 15 Jun 2016 21:09:31 +0000 (21:09 +0000)]
Merge "Send VR mode notification to AR app on context hub" into nyc-dev
Richard Ho [Wed, 15 Jun 2016 21:06:05 +0000 (21:06 +0000)]
Merge "added null check in doInBackground and if null, properly intializes variables." into nyc-dev
Winson [Wed, 15 Jun 2016 19:31:03 +0000 (12:31 -0700)]
Fixing issue with screen pinning screen not showing for secondary users.
- Catch the exception when removing a view that is not yet attached.
This is not an issue because we are in the process of attaching it for
the first time anyways.
- Ensure that we post the calls from the secondary user in the main
thread for the system user. Especially since this calls through to
add the view for the new screen pinning window.
Bug:
29341417
Change-Id: If0e29a77ddb67426115f1d5d9f1adb580a1f07df
Kevin Gabayan [Wed, 15 Jun 2016 20:55:42 +0000 (20:55 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f am:
e46d4fd7ad
am:
68dd6233bd
Change-Id: I63376fc9763bc11b7934e2a9b45c95a8c3745b32
Tianjie Xu [Wed, 15 Jun 2016 20:55:31 +0000 (20:55 +0000)]
Merge \"Fix a naming typo for source_build\" into nyc-dev
am:
dfa654edfe
Change-Id: Ie58c4fa52cec17cec430770fec01e43a5ff5153e
Brad Ebinger [Wed, 15 Jun 2016 00:04:01 +0000 (17:04 -0700)]
Handle Concurrency issues in Connection
Currently, there is a possibility of concurrent thread operations to the
Extras bundle in Conference/Connection. This can cause unexpected
behavior. We have added a lock on the Extras to prevent that from
occuring.
Bug:
29330310
Change-Id: Id63a9797c2f748120a3df8e3ce06c4ce3891c651
Kevin Gabayan [Wed, 15 Jun 2016 20:49:49 +0000 (20:49 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136 am:
db843c913f
am:
e46d4fd7ad
Change-Id: I666fc7432cf6140c938423ec4370ca7727996bd6
Tianjie Xu [Wed, 15 Jun 2016 20:46:07 +0000 (20:46 +0000)]
Merge "Fix a naming typo for source_build" into nyc-dev
Kevin Gabayan [Wed, 15 Jun 2016 20:40:34 +0000 (20:40 +0000)]
Compute AnyMotionDetector angle using atan2. Bug:
29232136
am:
db843c913f
Change-Id: I1d2af755dd1a06fc2fef464b6ad5bc5e26f11ff6
Mady Mellor [Thu, 9 Jun 2016 17:42:42 +0000 (10:42 -0700)]
Fixes issue with group backgrounds when animating to keyguard
The backgrounds weren't being updated before the collapse animation when
going to the keyguard so it would look very bad when they collapsed.
This moves updating the background into setChildrenExpanded which will
cover updating the background for both the tapping to expand case as
well as the animating to the keyguard case.
Change-Id: Icba2fa895498d307a38bd9f65be06265afd21a1a
Fixes:
29240532
Tianjie Xu [Wed, 15 Jun 2016 19:31:53 +0000 (12:31 -0700)]
Fix a naming typo for source_build
When parsing the last_install, the variable name is supposed to be
*source_build* instead of *source_version*.
Bug:
28658632
Change-Id: I1e0ed7150e04885f904b6a3efa18bd5cfe17cc96
Andrew Solovay [Wed, 15 Jun 2016 19:26:37 +0000 (19:26 +0000)]
Merge \"docs: Updates to DP4 release notes for Android for Work\" into nyc-dev
am:
215b85a738
Change-Id: Ib527d2b3aa5bfa12b978bd80f89434878ba0c4a1
TreeHugger Robot [Wed, 15 Jun 2016 19:21:49 +0000 (19:21 +0000)]
Merge "docs: Updates to DP4 release notes for Android for Work" into nyc-dev
Adam Lesinski [Tue, 14 Jun 2016 18:05:23 +0000 (11:05 -0700)]
ResourcesManager: Allow managed addition of library asset paths
This allows WebView to add itself to the ResourcesManager and
remain their even after configuration changes and multi-window
changes.
Bug:
29112218
Change-Id: I2cb131ae2c61fb58c48babafdd46c1882be96aa9
David Gross [Wed, 15 Jun 2016 18:44:03 +0000 (18:44 +0000)]
Merge "Delete simple reduction implementation."
Brian Duddie [Tue, 14 Jun 2016 22:12:26 +0000 (15:12 -0700)]
Send VR mode notification to AR app on context hub
Bug:
28793778
Change-Id: I7417ba7f696dc61689687bd56b165a81aea1715a
Amith Yamasani [Mon, 13 Jun 2016 19:09:36 +0000 (12:09 -0700)]
More thorough cleansing of expired users
If any /data/system_[c|d]e folders were not erased
when the user was removed (maybe due to a reboot),
make sure they're cleaned up on restart as well
as when the userId is recycled later.
Mark the users' system folders with the correct
serial number for later verification.
AccountManager shouldn't be querying accounts of
partially created/destroyed users.
Change-Id: I4313756b7464f34cd5ce4fb296d61daa50b41fcb
Fixes:
29285673
Richard Ho [Mon, 13 Jun 2016 23:54:04 +0000 (16:54 -0700)]
added null check in doInBackground and if null, properly intializes
variables.
Bug:
29234237
Change-Id: I1d65b1a232c71efdd11a917769aec5044867a085
(cherry picked from commit
0f0f5414f4860de7f5e98d783b3172a39a42df2f)
Joe Fernandez [Wed, 15 Jun 2016 18:09:57 +0000 (18:09 +0000)]
Merge \"docs: removing duplicate security config doc\" into nyc-dev
am:
d5f7bf8032
Change-Id: Ic6be2f3422eec325e31997ba75732074017443c4
Adrian Roos [Wed, 15 Jun 2016 18:06:23 +0000 (18:06 +0000)]
Merge \"A11y: Fix notification bounds when top notification is scrolled\" into nyc-dev
am:
2e0aadf256
Change-Id: I73affa5f95d853c34be508da10092e94c7f24e72
Andrew Solovay [Wed, 15 Jun 2016 18:04:59 +0000 (11:04 -0700)]
docs: Added AfW item to DP4 "Behavior Changes" page
See first comment for doc stage location.
Change-Id: I188eb64a2fc854f82e4493213938346cd5847b5b
Joe Fernandez [Wed, 15 Jun 2016 18:02:50 +0000 (18:02 +0000)]
Merge "docs: removing duplicate security config doc" into nyc-dev
Adrian Roos [Wed, 15 Jun 2016 17:55:51 +0000 (17:55 +0000)]
Merge "A11y: Fix notification bounds when top notification is scrolled" into nyc-dev
Toni Barzic [Wed, 15 Jun 2016 17:53:10 +0000 (17:53 +0000)]
Merge \"Clear calling identity before calling mountService\" into nyc-dev
am:
b2a45c00f6
Change-Id: I4f5856f2ea1d820ef6f67988222f2301a57a7585
Joe Fernandez [Wed, 15 Jun 2016 17:50:42 +0000 (10:50 -0700)]
docs: removing duplicate security config doc
current doc: https://developer.android.com/preview/features/security-config.html
The N Preview version of this page will move to this location when N is
officially released.
Change-Id: Idf3bb2ea13b5f08efd3187bb1b1fbb6944519507
Toni Barzic [Wed, 15 Jun 2016 17:45:55 +0000 (17:45 +0000)]
Merge "Clear calling identity before calling mountService" into nyc-dev
Andrew Solovay [Wed, 15 Jun 2016 16:54:57 +0000 (09:54 -0700)]
docs: Updates to DP4 release notes for Android for Work
See first comment for doc stage location.
Change-Id: I20ee0f104ebf2eb274e599ede8bfe5c0c59077fe
Adrian Roos [Tue, 14 Jun 2016 22:51:40 +0000 (15:51 -0700)]
A11y: Fix notification bounds when top notification is scrolled
Previously, scrolled notifications would collapse into a stack (the top
stack). With the new design, that's no longer the case, so tall
notifications can now be scrolled out so much that their translation
becomes negative.
Unfortunatly, getBoundsOnScreen then clips the bounds to the parent,
which interferes with our adjustment to the bounds, so we first undo
the clipping.
Fixes:
29368064
Change-Id: I71da054ed1eb6d06868d56e18d0320f764ed86b3
Jason Monk [Wed, 15 Jun 2016 17:03:45 +0000 (17:03 +0000)]
Merge \"Fix flashlight dim state\" into nyc-dev
am:
817c4ca6d4
Change-Id: I190cc69db49086b4acbf6e99c359ffa93b1ef956
Jason Monk [Wed, 15 Jun 2016 16:55:21 +0000 (16:55 +0000)]
Merge "Fix flashlight dim state" into nyc-dev
Robert Carr [Wed, 15 Jun 2016 16:47:54 +0000 (16:47 +0000)]
Merge \"PopupWindow: Resolve measure specs before passing to WM.\" into nyc-dev
am:
4a284be41d
Change-Id: I356e7202bd8939eb5543190f17893abd43c0a0a6
TreeHugger Robot [Wed, 15 Jun 2016 16:41:50 +0000 (16:41 +0000)]
Merge "PopupWindow: Resolve measure specs before passing to WM." into nyc-dev
Chris Wren [Wed, 15 Jun 2016 15:52:14 +0000 (15:52 +0000)]
Merge \"Revert \"boost starred people to at least high importance\"\" into nyc-dev
am:
f156ab3f3a
Change-Id: I66e7fb0d71ce8e52f2ec08dfdf07f14596a9e385
Chris Wren [Wed, 15 Jun 2016 15:42:23 +0000 (15:42 +0000)]
Merge "Revert "boost starred people to at least high importance"" into nyc-dev
Julia Reynolds [Wed, 15 Jun 2016 15:02:27 +0000 (15:02 +0000)]
Merge \"Fix accessibility for autorotate tile.\" into nyc-dev
am:
7f9e4d13c0
Change-Id: Ifb1575b9b50696242c46b690e061fcd350660ed7
Shawn Willden [Wed, 15 Jun 2016 14:55:50 +0000 (14:55 +0000)]
Merge \"Update semantics of on-body Keystore API.\" into nyc-dev
am:
c152fc15a9
Change-Id: Ic9a083b5f7c458c2aa7e218168c461da7fc154d0
Julia Reynolds [Wed, 15 Jun 2016 14:54:40 +0000 (14:54 +0000)]
Merge "Fix accessibility for autorotate tile." into nyc-dev
Jason Monk [Wed, 15 Jun 2016 14:53:03 +0000 (10:53 -0400)]
Fix flashlight dim state
Change-Id: I7875d4a0c3733ac2462713d7618d1b7595ea2075
Fixes:
29330406
Shawn Willden [Wed, 15 Jun 2016 14:48:52 +0000 (14:48 +0000)]
Merge "Update semantics of on-body Keystore API." into nyc-dev
Michael Wright [Wed, 15 Jun 2016 14:46:47 +0000 (14:46 +0000)]
Merge \"Make lid switch edge rather than level triggered.\" into nyc-dev
am:
e85da2bc2e
Change-Id: I20b3665d2ea3323991166936d47d85399d679aa4
Michael Wright [Wed, 15 Jun 2016 14:34:55 +0000 (14:34 +0000)]
Merge "Make lid switch edge rather than level triggered." into nyc-dev
smain@google.com [Wed, 15 Jun 2016 04:43:08 +0000 (04:43 +0000)]
Merge \"Update the DP4 setup instruction for api level 24\" into nyc-dev
am:
627bca6e80
Change-Id: Id96cdca298e44f0cfee347c1be82cd22222d24ba
Scott Main [Wed, 15 Jun 2016 04:36:10 +0000 (04:36 +0000)]
Merge "Update the DP4 setup instruction for api level 24" into nyc-dev
smain@google.com [Wed, 15 Jun 2016 00:03:36 +0000 (17:03 -0700)]
Update the DP4 setup instruction for api level 24
Change-Id: I8db52d56b1c33e02cffb589a19b1cb1ed20894f4
Joe Fernandez [Wed, 15 Jun 2016 04:15:54 +0000 (04:15 +0000)]
Merge \"Revert \"docs: Add Videos section to N Preview landing page\"\" into nyc-dev
am:
d320c6315a
Change-Id: I04fe2061fcddd36ffa4c38504780c31ae29e9198
Joe Fernandez [Wed, 15 Jun 2016 04:15:51 +0000 (04:15 +0000)]
Merge \"docs: Updates for DP4 release\" into nyc-dev
am:
7c79f1663c
Change-Id: I064f37139fc3e9638786a03b5af5287b94f2b9ed
Joe Fernandez [Wed, 15 Jun 2016 04:10:14 +0000 (04:10 +0000)]
Merge "Revert "docs: Add Videos section to N Preview landing page"" into nyc-dev
Joe Fernandez [Wed, 15 Jun 2016 04:06:40 +0000 (04:06 +0000)]
Revert "docs: Add Videos section to N Preview landing page"
Reverting this change since I don't have confirmation that the videos will ship by 10am on 6/15.
This reverts commit
a1f02ff4e439d9de58ed4a788a52c2f73cfc36ce.
Change-Id: I854c589436bcc4e146770415898996826f552b21
Joe Fernandez [Wed, 15 Jun 2016 04:04:41 +0000 (04:04 +0000)]
Merge "docs: Updates for DP4 release" into nyc-dev
Joe Fernandez [Wed, 15 Jun 2016 01:42:11 +0000 (18:42 -0700)]
docs: Updates for DP4 release
- note final SDK is available
- update links to DP4 release notes
Change-Id: Id56b4bc9673f7ad12212d67045dc18fb9c72a6e8
Adarsh Fernando [Wed, 15 Jun 2016 03:48:16 +0000 (03:48 +0000)]
Merge \"Docs: Updated \'NDK Apps Linking to Platform Libraries\'\" into nyc-dev
am:
ab62c65da9
Change-Id: I0033c391baf1bba245d9e970bad93970f4272703
Adarsh Fernando [Wed, 15 Jun 2016 03:43:14 +0000 (03:43 +0000)]
Merge "Docs: Updated 'NDK Apps Linking to Platform Libraries'" into nyc-dev
Andrew Solovay [Wed, 15 Jun 2016 03:33:52 +0000 (03:33 +0000)]
Merge \"docs: Wording change for Support Lib 24.0 release notes\" into nyc-dev
am:
3c5d725c86
Change-Id: I0e89b944bdd259b06fcafbb0e1121119e208cea0
Adarsh Fernando [Tue, 14 Jun 2016 03:33:27 +0000 (20:33 -0700)]
Docs: Updated 'NDK Apps Linking to Platform Libraries'
- updated compatibility with future platform releases
- expanded on ways to dignose and debug
Bug:
29215157
Change-Id: Ie63d024eac9914d4553419c734132696fb94d7e5
Andrew Solovay [Wed, 15 Jun 2016 03:26:41 +0000 (03:26 +0000)]
Merge \"docs: Updating N preview release notes for DP4\" into nyc-dev
am:
64df8c2d63
Change-Id: I1df2178babe7b83c5de11dc69b5122315ed53e20
TreeHugger Robot [Wed, 15 Jun 2016 03:24:07 +0000 (03:24 +0000)]
Merge "docs: Wording change for Support Lib 24.0 release notes" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 03:15:29 +0000 (03:15 +0000)]
Merge "docs: Updating N preview release notes for DP4" into nyc-dev
David Friedman [Wed, 15 Jun 2016 01:46:04 +0000 (01:46 +0000)]
Merge \"Docs: Updated localizations for N Developer Preview docs.\" into nyc-dev
am:
07af76b039
Change-Id: I19c01ced2d1ac4463c1e23462aebfbf761cf1bd7
David Friedman [Wed, 15 Jun 2016 01:39:40 +0000 (01:39 +0000)]
Merge "Docs: Updated localizations for N Developer Preview docs." into nyc-dev
David Friedman [Wed, 15 Jun 2016 01:14:49 +0000 (18:14 -0700)]
Docs: Updated localizations for N Developer Preview docs.
Bug:
28912213
Change-Id: I8ff0dd5989863ce4097e2290ff9a10e4cc5789ec
Todd Kennedy [Wed, 15 Jun 2016 01:35:09 +0000 (01:35 +0000)]
Merge \"Update CTS shims\" into nyc-dev
am:
6f140a249a
Change-Id: I46a95ea5eb9199c63e8f0a62ddf7c6eac149147d
TreeHugger Robot [Wed, 15 Jun 2016 01:29:41 +0000 (01:29 +0000)]
Merge "Update CTS shims" into nyc-dev
Andrew Solovay [Wed, 15 Jun 2016 01:21:22 +0000 (18:21 -0700)]
docs: Wording change for Support Lib 24.0 release notes
See first comment for doc stage location.
bug:
29215447
Change-Id: I75b1dc88e19e557c9ffee6336bfc342a17d1271f
Winson [Wed, 15 Jun 2016 01:16:02 +0000 (01:16 +0000)]
Merge \"Only skip trimming task if the stacks are not null.\" into nyc-dev
am:
6ba96df815
Change-Id: I58b230bb33330fbb130094cc937c4aeaf5976baa
Sudheer Shanka [Wed, 15 Jun 2016 01:12:11 +0000 (01:12 +0000)]
Merge \"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\" into nyc-dev
am:
159c13801b
Change-Id: Ic4d94327a21f2a8b8ae175e057039eafb9c2d698
David Friedman [Wed, 15 Jun 2016 01:12:07 +0000 (01:12 +0000)]
Merge \"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\" into nyc-dev
am:
ea1f3cb5c3
Change-Id: Ia61b3fd592e19c7fb021b0f22e3eeb8bbc6b5b4f
Robert Carr [Wed, 15 Jun 2016 01:12:03 +0000 (01:12 +0000)]
Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev
am:
3e5df9fb50
Change-Id: I97742b1d180ff1c38a1aa7ea0a13c981a38c1df3
Andrew Solovay [Tue, 14 Jun 2016 21:38:32 +0000 (14:38 -0700)]
docs: Updating N preview release notes for DP4
See first comment for doc stage location.
bug:
28982873
Change-Id: I692b361f4a0d2d3627fa8cea19082fc24306f470
TreeHugger Robot [Wed, 15 Jun 2016 01:08:57 +0000 (01:08 +0000)]
Merge "Only skip trimming task if the stacks are not null." into nyc-dev
Shawn Willden [Wed, 15 Jun 2016 01:05:26 +0000 (01:05 +0000)]
Merge \"Unbreak Javadoc on getAttestationChallenge()\" into nyc-dev
am:
2c2f8acdab
Change-Id: I89b9c88159f99681049ce401f22ca9ea8578b27c
TreeHugger Robot [Wed, 15 Jun 2016 01:02:32 +0000 (01:02 +0000)]
Merge "Allow apps with CREATE_USERS permission to call UM.getUserInfo." into nyc-dev
David Friedman [Wed, 15 Jun 2016 00:59:52 +0000 (00:59 +0000)]
Merge "Docs: Adds SurfaceView to API Overview page for Android-N DP4." into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 00:59:19 +0000 (00:59 +0000)]
Merge "Toast timeout: Just strip FLAG_KEEP_SCREEN_ON" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 00:56:45 +0000 (00:56 +0000)]
Merge "Unbreak Javadoc on getAttestationChallenge()" into nyc-dev
David Friedman [Tue, 14 Jun 2016 22:37:16 +0000 (15:37 -0700)]
Docs: Adds SurfaceView to API Overview page for Android-N DP4.
Change-Id: I29854c82ef788b00c1ebc305bc5faf463c2d8dc8
Dirk Dougherty [Wed, 15 Jun 2016 00:28:03 +0000 (00:28 +0000)]
Merge \"Add API 24 to reference selector.\" into nyc-dev
am:
398d088871
Change-Id: I51a61188186026eac5c12f3b0d0ec52eebf60f38
OSDN Git Service
