OSDN Git Service
Luan Nguyen [Tue, 26 May 2015 21:09:55 +0000 (21:09 +0000)]
am
f42d05bc: am
597788c6: am
9510d046: Merge "docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample." into mnc-preview-docs
* commit '
f42d05bc343b1226543b05bbd081b93663ddefca':
docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample.
Andrew Solovay [Tue, 26 May 2015 21:09:51 +0000 (21:09 +0000)]
am
f5c2de6f: am
28942bbe: am
99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc-preview-docs
* commit '
f5c2de6f52c4b1e88e3e63f6a59e487139b61047':
docs: M Runtime Permissions overview.
Wale Ogunwale [Tue, 26 May 2015 21:09:45 +0000 (21:09 +0000)]
am
8673f0c4: Merge "Don\'t leak starting window when app crashes before adding windows" into mnc-dev
* commit '
8673f0c4b70b0890c2026e676fa6cb379cff2414':
Don't leak starting window when app crashes before adding windows
Nancy Chen [Tue, 26 May 2015 21:09:41 +0000 (21:09 +0000)]
am
707368b5: Merge "Add vvm type for t-mobile." into mnc-dev
* commit '
707368b583dbc16ae65fdd91a5dd34f377aa29fa':
Add vvm type for t-mobile.
Jorim Jaggi [Tue, 26 May 2015 21:09:36 +0000 (21:09 +0000)]
am
d1e0b949: Merge "Add fingerprint icon" into mnc-dev
* commit '
d1e0b9493acc377c4d2638e103a80692d07e6936':
Add fingerprint icon
Luan Nguyen [Tue, 26 May 2015 20:57:23 +0000 (20:57 +0000)]
am
597788c6: am
9510d046: Merge "docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample." into mnc-preview-docs
* commit '
597788c6f0ee484b263346544a155898579d8206':
docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample.
Andrew Solovay [Tue, 26 May 2015 20:57:17 +0000 (20:57 +0000)]
am
28942bbe: am
99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc-preview-docs
* commit '
28942bbe21f188ac7da502454337ceea7c6323a9':
docs: M Runtime Permissions overview.
Wale Ogunwale [Tue, 26 May 2015 20:56:46 +0000 (20:56 +0000)]
Merge "Don't leak starting window when app crashes before adding windows" into mnc-dev
Nancy Chen [Tue, 26 May 2015 20:54:26 +0000 (20:54 +0000)]
Merge "Add vvm type for t-mobile." into mnc-dev
Jorim Jaggi [Tue, 26 May 2015 20:51:43 +0000 (20:51 +0000)]
am
4e792fa5: Merge "Polish animations for fingerprint icon" into mnc-dev
* commit '
4e792fa5a9b8de20503011dcffce92f96435d53c':
Polish animations for fingerprint icon
MediaPlayer: add mPreparing to weed out unwanted prepared messages
BatteryStatsService: Only query bluetooth on demand.
Indicate failed scans with EXTRA_RESULTS_UPDATED
BatteryStatsService: Only query bluetooth on demand.
Indicate failed scans with EXTRA_RESULTS_UPDATED
For getHomeActivity() only return current user.
Fix application moves.
Close race condition in binderDied()
Write packages.list when adding/removing users.
camera: Add AIDL interface for CameraServiceProxy.
Fix NPE in setSurfaceTexure
Deal more gracefully with null smallIcons.
Don't crash in bugreport on devices without BT
Push initial disk state, handle empty media.
Nicolas Prevot [Tue, 26 May 2015 20:51:38 +0000 (20:51 +0000)]
am
5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev
* commit '
5e0ef0d0e62b77bcfc687bfbc1db875db71eba69':
Say in the doc that DISALLOW_CONFIG_VPN now works.
Quddus Chong [Tue, 26 May 2015 20:51:34 +0000 (20:51 +0000)]
am
cf3c8af6: am
125dbf89: am
d313958f: Merge "docs: Add API Overview and Behavior Changes docs for M Developer Preview." into mnc-preview-docs
* commit '
cf3c8af6c5dbdd7c0c7c019fe10ca21c9c2369cc':
docs: Add API Overview and Behavior Changes docs for M Developer Preview.
Jorim Jaggi [Tue, 26 May 2015 20:50:46 +0000 (20:50 +0000)]
Merge "Add fingerprint icon" into mnc-dev
Jorim Jaggi [Wed, 20 May 2015 02:47:11 +0000 (19:47 -0700)]
Add fingerprint icon
Bug:
20663748
Change-Id: Iae9512173f7ea9d3d62a53cded29d23140bdcfd8
Jorim Jaggi [Tue, 26 May 2015 20:48:38 +0000 (20:48 +0000)]
Merge "Polish animations for fingerprint icon" into mnc-dev
Luan Nguyen [Tue, 26 May 2015 20:44:12 +0000 (20:44 +0000)]
am
9510d046: Merge "docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample." into mnc-preview-docs
* commit '
9510d0464f1e33c8a9adf5dde7f1a503a0f20b0b':
docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample.
Andrew Solovay [Tue, 26 May 2015 20:44:00 +0000 (20:44 +0000)]
am
99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc-preview-docs
* commit '
99f4bdf5ff90fe17512d4a77142f254a489bccc2':
docs: M Runtime Permissions overview.
Nicolas Prevot [Tue, 26 May 2015 20:39:27 +0000 (20:39 +0000)]
Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev
Quddus Chong [Tue, 26 May 2015 20:37:00 +0000 (20:37 +0000)]
am
125dbf89: am
d313958f: Merge "docs: Add API Overview and Behavior Changes docs for M Developer Preview." into mnc-preview-docs
* commit '
125dbf895db097cd83cbeedc81571060f3f40099':
docs: Add API Overview and Behavior Changes docs for M Developer Preview.
Luan Nguyen [Tue, 26 May 2015 20:36:44 +0000 (20:36 +0000)]
Merge "docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample." into mnc-preview-docs
Jorim Jaggi [Wed, 20 May 2015 21:13:23 +0000 (14:13 -0700)]
Polish animations for fingerprint icon
- Make error state animation faster.
- Add animation for
-- Draw on when turning on the screen
-- Draw off when unlocking
-- Error state -> normal state
Bug:
21269675
Change-Id: If09c0a35ce194fbeeb86151d45b4cfa81c9999c5
Andrew Solovay [Tue, 26 May 2015 20:30:41 +0000 (20:30 +0000)]
Merge "docs: M Runtime Permissions overview." into mnc-preview-docs
Joe Fernandez [Tue, 26 May 2015 20:30:26 +0000 (20:30 +0000)]
am
5fa7b8bd: am
ec5aa0e1: am
71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs
* commit '
5fa7b8bd8cbf6407ab88bdf5f3e3a6e40053b98c':
docs: M Preview - Performance Testing
Quddus Chong [Tue, 26 May 2015 20:23:22 +0000 (20:23 +0000)]
am
d313958f: Merge "docs: Add API Overview and Behavior Changes docs for M Developer Preview." into mnc-preview-docs
* commit '
d313958f8ed099b90bbd3580580f4e37e9bf3c81':
docs: Add API Overview and Behavior Changes docs for M Developer Preview.
Joe Fernandez [Tue, 26 May 2015 20:22:00 +0000 (20:22 +0000)]
am
ec5aa0e1: am
71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs
* commit '
ec5aa0e183011d0243219f760250b917d7a24c63':
docs: M Preview - Performance Testing
Quddus Chong [Tue, 26 May 2015 20:13:34 +0000 (20:13 +0000)]
Merge "docs: Add API Overview and Behavior Changes docs for M Developer Preview." into mnc-preview-docs
Quddus Chong [Sun, 10 May 2015 23:07:27 +0000 (16:07 -0700)]
docs: Add API Overview and Behavior Changes docs for M Developer Preview.
Change-Id: I4aff933b60b7eac17ccfa4f5f41f26153d464418
Joe Fernandez [Tue, 26 May 2015 20:08:42 +0000 (20:08 +0000)]
am
71574a99: Merge "docs: M Preview - Performance Testing" into mnc-preview-docs
* commit '
71574a995b9ac66673970b99f12a94cf84901418':
docs: M Preview - Performance Testing
Joe Fernandez [Tue, 26 May 2015 20:01:50 +0000 (20:01 +0000)]
am
96e97b55: am
37f827db: am
c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs
* commit '
96e97b5563773c37f4e43ef6121851ce8beb794a':
docs: M Preview Testing Guide
Lajos Molnar [Tue, 26 May 2015 20:01:45 +0000 (20:01 +0000)]
am
a04c7d40: Merge "media: Update MediaCodec class description" into mnc-dev
* commit '
a04c7d400c7b9d39b56cec3d705eea39a767370e':
media: Update MediaCodec class description
Joe Fernandez [Tue, 26 May 2015 20:00:56 +0000 (20:00 +0000)]
Merge "docs: M Preview - Performance Testing" into mnc-preview-docs
Joe Fernandez [Sat, 23 May 2015 06:53:28 +0000 (23:53 -0700)]
docs: M Preview - Performance Testing
Change-Id: I6b23d83a198528353f60749e07d40a00c051866d
Joe Fernandez [Tue, 26 May 2015 19:58:04 +0000 (19:58 +0000)]
am
37f827db: am
c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs
* commit '
37f827db9b3a66f7f4f455011d42c84e610416d6':
docs: M Preview Testing Guide
Andrew Solovay [Wed, 13 May 2015 01:01:13 +0000 (18:01 -0700)]
docs: M Runtime Permissions overview.
Based on the Google Doc which has gone through tech review. See
first comment for doc stage location.
NOTE: Because the M Preview reference docs are not going to be live on
DAC (they'll be downloadable in a zip archive, I believe), we can't
put in live hyperlinks to new-for-M classes/fields/ methods. Those
have to just be in <code> font with no link. This is consistent across
all the preview docs, and will of course change when these docs are
converted for the MNC release.
bug:
21411602
bug:
21411604
Change-Id: I1163abc1dc884cf27b0e94d266f3979f131db2ab
Lajos Molnar [Tue, 26 May 2015 19:52:01 +0000 (19:52 +0000)]
Merge "media: Update MediaCodec class description" into mnc-dev
Lajos Molnar [Fri, 22 May 2015 16:35:58 +0000 (09:35 -0700)]
media: Update MediaCodec class description
Bug:
11990465
Bug:
11019199
Bug:
11990564
Bug:
10672559
Change-Id: I22533dec98fb878ca87876c9ebc0fe59f4bfe995
John Spurlock [Tue, 26 May 2015 19:50:07 +0000 (19:50 +0000)]
am
12e0b390: Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev
* commit '
12e0b390efd2fb8c21a2700be9dcd95d15b31ba6':
Zen: Calendar auto-rule tracks primary calendar for corp profile.
John Spurlock [Tue, 26 May 2015 19:41:51 +0000 (19:41 +0000)]
Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev
Joe Fernandez [Tue, 26 May 2015 19:41:48 +0000 (19:41 +0000)]
am
c3d171bb: Merge "docs: M Preview Testing Guide" into mnc-preview-docs
* commit '
c3d171bbe1c55445ff475c63203b4a8eae5e40c7':
docs: M Preview Testing Guide
John Spurlock [Wed, 20 May 2015 13:47:13 +0000 (09:47 -0400)]
Zen: Calendar auto-rule tracks primary calendar for corp profile.
- Track the calendar provider for the managed profile user if found.
- Add userId to the shared data structure to disambig calendar ids.
- Delay rule update a bit to guard against chatty updates.
- Fix logging in calendar rule.
Bug:
21155107
Change-Id: Id2303fcc39b1fa7417b1844b7869d773ef92434c
Joe Fernandez [Tue, 26 May 2015 19:26:40 +0000 (19:26 +0000)]
Merge "docs: M Preview Testing Guide" into mnc-preview-docs
Joe Fernandez [Thu, 21 May 2015 23:31:13 +0000 (16:31 -0700)]
docs: M Preview Testing Guide
A general overview for developers on what to test during the M Preview
Change-Id: Idbc080482afdaf08c665e4ff2b7e62a84f9b398a
Jason Monk [Tue, 26 May 2015 19:10:25 +0000 (19:10 +0000)]
am
c2ddb3e4: Merge "Switch runtime permission icons to vectors" into mnc-dev
* commit '
c2ddb3e452d4d3a360ad697bf89a786f2af7a377':
Switch runtime permission icons to vectors
Jean-Michel Trivi [Tue, 26 May 2015 19:10:21 +0000 (19:10 +0000)]
am
5c37f1ee: Merge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev
* commit '
5c37f1ee57d85185eb36c6f961722f2d39022447':
Remove temporary javadoc for android.media.AudioFormat
Jason Monk [Tue, 26 May 2015 19:04:27 +0000 (19:04 +0000)]
Merge "Switch runtime permission icons to vectors" into mnc-dev
Jean-Michel Trivi [Tue, 26 May 2015 19:01:19 +0000 (19:01 +0000)]
Merge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev
Jean-Michel Trivi [Tue, 26 May 2015 18:50:11 +0000 (11:50 -0700)]
Remove temporary javadoc for android.media.AudioFormat
Remove temporary text in javadoc for AudioFormat.
Start javadoc for encoding.
Change-Id: I3df5f868da50b8ba4b42a9f054d5cd472f68069d
Abodunrinwa Toki [Tue, 26 May 2015 18:39:24 +0000 (18:39 +0000)]
am
da1b3981: Merge "Support icons in the FloatingToolbar" into mnc-dev
* commit '
da1b398173a94e94c61a0d186c7dc0ef2a7bd060':
Support icons in the FloatingToolbar
Jason Monk [Tue, 26 May 2015 18:33:53 +0000 (14:33 -0400)]
Switch runtime permission icons to vectors
Bug:
21367016
Change-Id: I37745eae54e977258b4ec9b184610efd94b268bb
Abodunrinwa Toki [Tue, 26 May 2015 18:26:36 +0000 (18:26 +0000)]
Merge "Support icons in the FloatingToolbar" into mnc-dev
Alex Klyubin [Tue, 26 May 2015 18:04:40 +0000 (18:04 +0000)]
am
7bf011ab: Merge "Remove KeyStoreParameter.getContext()." into mnc-dev
* commit '
7bf011ab924f465c7a779f4e42fdd4f9d7c6a09a':
Remove KeyStoreParameter.getContext().
Alex Klyubin [Tue, 26 May 2015 17:57:53 +0000 (17:57 +0000)]
Merge "Remove KeyStoreParameter.getContext()." into mnc-dev
Paul Jensen [Tue, 26 May 2015 17:45:36 +0000 (17:45 +0000)]
am
46ed04de: Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev
* commit '
46ed04de082b18137d879161802fd8512a70e9d4':
Add javadoc comments mentioning ConnectivityManager API permissions.
Paul Jensen [Tue, 26 May 2015 17:45:32 +0000 (17:45 +0000)]
am
7891fcb5: Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev
* commit '
7891fcb52a8e0295e3f1d29f534376fd8cbc8d46':
Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)
Alex Klyubin [Tue, 26 May 2015 17:40:15 +0000 (10:40 -0700)]
Remove KeyStoreParameter.getContext().
This method isn't there in the released API and we don't need it in
the new API.
Bug:
18088752
Change-Id: Iccd80715bec782ac3a12bea169df4d37264f66f9
Paul Jensen [Tue, 26 May 2015 17:37:32 +0000 (17:37 +0000)]
Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev
Paul Jensen [Tue, 26 May 2015 17:33:24 +0000 (17:33 +0000)]
Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev
Alan Viverette [Tue, 26 May 2015 17:32:54 +0000 (17:32 +0000)]
am
75a857ce: Merge "Handle error states when refreshing accessibility node" into mnc-dev
* commit '
75a857cec5f3500954a76f251e81535378ba293a':
Handle error states when refreshing accessibility node
Jean-Michel Trivi [Tue, 26 May 2015 17:32:49 +0000 (17:32 +0000)]
am
dfe318d7: Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev
* commit '
dfe318d7120b8a1299dda957ad84d29171b583fb':
Ringtone picker is not affected by current sonification policy
Rich Slogar [Tue, 26 May 2015 17:32:43 +0000 (17:32 +0000)]
am
7ae3520e: am
59e5d718: am
a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs
* commit '
7ae3520e6fb996d00e90f6cdc55cddff66f3b617':
docs: support library 22.2 updates
Alan Viverette [Tue, 26 May 2015 17:29:38 +0000 (17:29 +0000)]
Merge "Handle error states when refreshing accessibility node" into mnc-dev
Jean-Michel Trivi [Tue, 26 May 2015 17:27:06 +0000 (17:27 +0000)]
Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:26:09 +0000 (17:26 +0000)]
am
7cd8a7e1: Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev
* commit '
7cd8a7e1bdb0019e52c1eaff7c1c6b17ba0e4719':
SysUI: Move LocationControllerImpl receiver to bg
Chris Craik [Tue, 26 May 2015 17:26:05 +0000 (17:26 +0000)]
am
87d8bb3d: Merge "Unflip TextureView getBitmap readback" into mnc-dev
* commit '
87d8bb3d85416c28545f94feb1db77875ebe9cf2':
Unflip TextureView getBitmap readback
Chet Haase [Tue, 26 May 2015 17:26:00 +0000 (17:26 +0000)]
am
1ddc95eb: Merge "Clarify example for Deep Share" into mnc-dev
* commit '
1ddc95ebb244660244681558d16325771ca56b3c':
Clarify example for Deep Share
Rich Slogar [Tue, 26 May 2015 17:23:48 +0000 (17:23 +0000)]
am
59e5d718: am
a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs
* commit '
59e5d7189911fc86a65624a337a75d8f840cff3d':
docs: support library 22.2 updates
Jason Monk [Tue, 26 May 2015 17:19:09 +0000 (17:19 +0000)]
Merge "SysUI: Move LocationControllerImpl receiver to bg" into mnc-dev
Chris Craik [Tue, 26 May 2015 17:19:01 +0000 (17:19 +0000)]
Merge "Unflip TextureView getBitmap readback" into mnc-dev
Chet Haase [Tue, 26 May 2015 17:15:57 +0000 (17:15 +0000)]
Merge "Clarify example for Deep Share" into mnc-dev
Jason Monk [Tue, 26 May 2015 17:13:05 +0000 (17:13 +0000)]
am
80370952: Merge "QS: Only show summary for active wifi" into mnc-dev
* commit '
80370952e9008ba3949d6e9bc3412e62a05e1ba3':
QS: Only show summary for active wifi
Jason Monk [Tue, 19 May 2015 18:21:28 +0000 (14:21 -0400)]
SysUI: Move LocationControllerImpl receiver to bg
Bug:
19520495
Change-Id: Ia0fbfb663076c296c65bcefdad62d36f98c9e757
Rich Slogar [Tue, 26 May 2015 17:07:42 +0000 (17:07 +0000)]
am
a67fa862: Merge "docs: support library 22.2 updates" into mnc-preview-docs
* commit '
a67fa862dc6b46b7642e2abfc2df3146d8be5d98':
docs: support library 22.2 updates
Jason Monk [Tue, 26 May 2015 17:01:50 +0000 (17:01 +0000)]
Merge "QS: Only show summary for active wifi" into mnc-dev
Rich Slogar [Tue, 26 May 2015 16:58:41 +0000 (16:58 +0000)]
Merge "docs: support library 22.2 updates" into mnc-preview-docs
Jason Monk [Tue, 26 May 2015 16:54:12 +0000 (12:54 -0400)]
QS: Only show summary for active wifi
Bug:
20432208
Change-Id: Iedf6e4d102e64c53a633f8d377b5eb57768b1f17
Luan Nguyen [Fri, 15 May 2015 22:27:17 +0000 (15:27 -0700)]
docs: Add Voice Actions section to Audio training lesson.
Add link for Universal Media Player sample.
bug:
20008284
bug:
19839477
Change-Id: I8bd0959cd41d7dde92608301c3be986339d5bf1b
Jason Monk [Tue, 26 May 2015 16:41:46 +0000 (16:41 +0000)]
am
16224288: Merge "Add constants for permissions granted status api" into mnc-dev
* commit '
16224288791dd3f122931504e624637fdcc70903':
Add constants for permissions granted status api
Jason Monk [Tue, 26 May 2015 16:32:52 +0000 (16:32 +0000)]
Merge "Add constants for permissions granted status api" into mnc-dev
James Cook [Tue, 26 May 2015 16:29:42 +0000 (16:29 +0000)]
am
327c3641: Merge "Cancel voice assist session on user switch" into mnc-dev
* commit '
327c364113c18c9d5a05df0c912b65788461da41':
Cancel voice assist session on user switch
James Cook [Tue, 26 May 2015 16:16:34 +0000 (16:16 +0000)]
Merge "Cancel voice assist session on user switch" into mnc-dev
Joseph Wen [Tue, 26 May 2015 15:23:15 +0000 (15:23 +0000)]
am
f981ea95: Merge "Update Statement Service" into mnc-dev
* commit '
f981ea95f2e951a558f73fb941cf006423e52627':
Update Statement Service
Joseph Wen [Tue, 26 May 2015 15:11:08 +0000 (15:11 +0000)]
Merge "Update Statement Service" into mnc-dev
dcashman [Tue, 26 May 2015 15:04:37 +0000 (15:04 +0000)]
am
b7b7b5ec: Merge "Set error code on failed keyset manifest parsing." into mnc-dev
* commit '
b7b7b5ece86e32a7e5636d0c41c3dee373e8ac5a':
Set error code on failed keyset manifest parsing.
dcashman [Tue, 26 May 2015 14:57:24 +0000 (14:57 +0000)]
Merge "Set error code on failed keyset manifest parsing." into mnc-dev
Jason Monk [Fri, 22 May 2015 18:50:21 +0000 (14:50 -0400)]
Add constants for permissions granted status api
Bug:
21078474
Change-Id: I6b0bcf0c11258ae263eb08366c14f9298798afdb
Lorenzo Colitti [Tue, 26 May 2015 12:52:14 +0000 (12:52 +0000)]
am
82babcd8: Specify more information in DhcpClient PendingIntents.
* commit '
82babcd83a568f9e938bf8b6b3b86b65e8b30e1f':
Specify more information in DhcpClient PendingIntents.
Lorenzo Colitti [Tue, 26 May 2015 08:31:47 +0000 (17:31 +0900)]
Specify more information in DhcpClient PendingIntents.
- Specify the package name. This provides a bit of security, but
not much since the package is "android".
- Specify the interface name so we can run more than one client
at a time.
Bug:
21395858
Bug:
19704592
Change-Id: I91c9ea15285b36628b6aef0b975c16a0b08d061e
Abodunrinwa Toki [Wed, 20 May 2015 21:25:16 +0000 (22:25 +0100)]
Support icons in the FloatingToolbar
Bug:
20202541
Change-Id: Id4d27851739ba557c7f7348094d79f0c5f782e6b
Martijn Coenen [Tue, 26 May 2015 09:36:25 +0000 (09:36 +0000)]
am
99fbb56a: Merge "Don\'t count lowmem mappings as memory used." into mnc-dev
* commit '
99fbb56a0ab81ead404480f0c2df529332a93a32':
Don't count lowmem mappings as memory used.
Martijn Coenen [Tue, 26 May 2015 08:11:26 +0000 (08:11 +0000)]
Merge "Don't count lowmem mappings as memory used." into mnc-dev
The Android Automerger [Tue, 26 May 2015 08:02:08 +0000 (01:02 -0700)]
merge in mnc-release history after reset to mnc-dev
Selim Cinek [Tue, 26 May 2015 07:40:59 +0000 (07:40 +0000)]
am
912696e7: Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev
* commit '
912696e79785ad26bb2f27354bedce1739f311e3':
Fixed logspam and handling subwindows with the input consumer
Selim Cinek [Tue, 26 May 2015 07:34:17 +0000 (07:34 +0000)]
Merge "Fixed logspam and handling subwindows with the input consumer" into mnc-dev
David Friedman [Tue, 26 May 2015 06:17:14 +0000 (06:17 +0000)]
am
35bf8322: am
515444ff: am
db9274e7: am
f8cd49ae: am
d580302d: Docs: Submitting fix for build-breaking CL 695942.
* commit '
35bf832248984f92da8de9700ec34ac5e032e116':
Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 06:17:08 +0000 (06:17 +0000)]
am
337089c8: am
e0f14f48: am
c25ff8e2: am
e11744fe: am
4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
* commit '
337089c8d1dc974a24b971fd3e0894086a4e2767':
Docs: Sample-walkthrough chapters for NDK documentation
Oliver Woodman [Tue, 26 May 2015 06:12:52 +0000 (06:12 +0000)]
am
b4ad97fc: am
a61df8f6: am
056bc731: am
1ddb7cae: am
eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
* commit '
b4ad97fc193e1a2d5e6254298f176742fbdfddb7':
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
Johan Euphrosine [Tue, 26 May 2015 06:12:47 +0000 (06:12 +0000)]
am
be0742e8: am
4170d9e0: am
165d4585: am
1ccbe54f: am
46350fea: frameworks/base/docs/ndk: add missing doxygen css
* commit '
be0742e8ee5cf1fe5cce2788c888171452ffe299':
frameworks/base/docs/ndk: add missing doxygen css
David Friedman [Tue, 26 May 2015 06:04:54 +0000 (06:04 +0000)]
am
515444ff: am
db9274e7: am
f8cd49ae: am
d580302d: Docs: Submitting fix for build-breaking CL 695942.
* commit '
515444ff434ff93c7b5c24bc356973f385e39adf':
Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 06:04:49 +0000 (06:04 +0000)]
am
e0f14f48: am
c25ff8e2: am
e11744fe: am
4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
* commit '
e0f14f48416484029a478e17e6b2c5708e0e0010':
Docs: Sample-walkthrough chapters for NDK documentation
Oliver Woodman [Tue, 26 May 2015 06:04:44 +0000 (06:04 +0000)]
am
a61df8f6: am
056bc731: am
1ddb7cae: am
eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
* commit '
a61df8f63c55d96c5443449a9fb538ad97224a52':
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
OSDN Git Service
