OSDN Git Service
Shreyas Basarge [Mon, 8 Feb 2016 23:52:27 +0000 (23:52 +0000)]
SyncManager sync blow up fix
Duplicates for periodic syncs would be
created just after boot and when a
periodic sync was delayed. This CL fixes
the behavior.
Bug:
26954967
Change-Id: I2440961629d443a62f96360563d435af9137857b
Przemyslaw Szczepaniak [Tue, 9 Feb 2016 10:35:39 +0000 (10:35 +0000)]
Merge "SocketImpl#getFileDescriptor shouldn't be public"
Neil Fuller [Tue, 9 Feb 2016 10:13:29 +0000 (10:13 +0000)]
Merge "Revert "Revert "Add java.util.function APIs"""
Jae Seo [Tue, 9 Feb 2016 03:39:28 +0000 (03:39 +0000)]
TIF: Fix the unresolved link to #stopRecording() am:
cd502cf715
am:
89d5e3aea5
* commit '
89d5e3aea5f9e762127876d7566351968d379743':
TIF: Fix the unresolved link to #stopRecording()
Jae Seo [Tue, 9 Feb 2016 03:34:18 +0000 (03:34 +0000)]
TIF: Fix the unresolved link to #stopRecording()
am:
cd502cf715
* commit '
cd502cf7150f0fb426f7f808c7d407ce89705239':
TIF: Fix the unresolved link to #stopRecording()
Jae Seo [Tue, 9 Feb 2016 03:24:12 +0000 (19:24 -0800)]
TIF: Fix the unresolved link to #stopRecording()
Change-Id: Ifa5aeb7c6f1d8210650a1d276872aa4e22d5ffa3
Jae Seo [Tue, 9 Feb 2016 02:25:45 +0000 (02:25 +0000)]
Merge "TIF: Allow the application to indicate a TV program to record" into nyc-dev am:
2a061b5bcf
am:
42afedb021
* commit '
42afedb0219aa4889ee8a0ed120f841a5a3acac6':
TIF: Allow the application to indicate a TV program to record
Jae Seo [Tue, 9 Feb 2016 02:20:22 +0000 (02:20 +0000)]
Merge "TIF: Allow the application to indicate a TV program to record" into nyc-dev
am:
2a061b5bcf
* commit '
2a061b5bcfb92be2829f6fe9a6d86352193752e3':
TIF: Allow the application to indicate a TV program to record
Jae Seo [Tue, 9 Feb 2016 02:14:11 +0000 (02:14 +0000)]
Merge "TIF: Allow the application to indicate a TV program to record" into nyc-dev
Jorim Jaggi [Tue, 9 Feb 2016 02:12:27 +0000 (02:12 +0000)]
Merge "Put dismiss end target at navigation bar" into nyc-dev am:
93f04f8920
am:
8629333b9c
* commit '
8629333b9c1fe90459120357421b831c8bf761bf':
Put dismiss end target at navigation bar
Jorim Jaggi [Tue, 9 Feb 2016 02:00:11 +0000 (02:00 +0000)]
Merge "Put dismiss end target at navigation bar" into nyc-dev
am:
93f04f8920
* commit '
93f04f89202d269fbb38c6f2ffacc3fa01728bbc':
Put dismiss end target at navigation bar
Jorim Jaggi [Tue, 9 Feb 2016 01:56:23 +0000 (01:56 +0000)]
Merge "Put dismiss end target at navigation bar" into nyc-dev
Tomasz Mikolajewski [Tue, 9 Feb 2016 01:38:44 +0000 (01:38 +0000)]
Merge "Cleanup sliding animation between directories."
Wei Wang [Tue, 9 Feb 2016 01:23:33 +0000 (01:23 +0000)]
Merge "Enable RTT Responder Role (1/4)." into mm-wireless-dev am:
03a6b18350 am:
c5c898640f
am:
6810ce957b
* commit '
6810ce957b4af21c42616c5e17db3b437bcd6531':
Enable RTT Responder Role (1/4).
Wei Wang [Tue, 9 Feb 2016 01:18:18 +0000 (01:18 +0000)]
Merge "Enable RTT Responder Role (1/4)." into mm-wireless-dev am:
03a6b18350
am:
c5c898640f
* commit '
c5c898640fd79562a3f278dbe825b39b0b65c7f7':
Enable RTT Responder Role (1/4).
Wei Wang [Tue, 9 Feb 2016 01:14:34 +0000 (01:14 +0000)]
Merge "Enable RTT Responder Role (1/4)." into mm-wireless-dev
am:
03a6b18350
* commit '
03a6b1835060b6c2082ea231fb1ad539aefd916e':
Enable RTT Responder Role (1/4).
Phil Weaver [Tue, 9 Feb 2016 01:12:09 +0000 (01:12 +0000)]
Merge "Clean up accessibility gestures." into nyc-dev am:
bdadd644a8
am:
fd2c638ed2
* commit '
fd2c638ed2ab852336fd44ca10119c530f4758aa':
Clean up accessibility gestures.
Oren Blasberg [Tue, 9 Feb 2016 01:10:52 +0000 (01:10 +0000)]
Fix vector "right arrow" drawable to be properly 24dp. am:
8ec0c5eb13
am:
9f47fc4b47
* commit '
9f47fc4b47e76dbb99ec03a6a41f23c38aa2359a':
Fix vector "right arrow" drawable to be properly 24dp.
Wei Wang [Tue, 9 Feb 2016 01:07:33 +0000 (01:07 +0000)]
Merge "Enable RTT Responder Role (1/4)." into mm-wireless-dev
Phil Weaver [Tue, 9 Feb 2016 01:06:45 +0000 (01:06 +0000)]
Merge "Clean up accessibility gestures." into nyc-dev
am:
bdadd644a8
* commit '
bdadd644a8873ca658775a6bf6b2b0c7838e1d9d':
Clean up accessibility gestures.
Oren Blasberg [Tue, 9 Feb 2016 01:02:39 +0000 (01:02 +0000)]
Fix vector "right arrow" drawable to be properly 24dp.
am:
8ec0c5eb13
* commit '
8ec0c5eb134183832fe182cfa2f5051e0fcc94e9':
Fix vector "right arrow" drawable to be properly 24dp.
Phil Weaver [Tue, 9 Feb 2016 01:00:17 +0000 (01:00 +0000)]
Merge "Clean up accessibility gestures." into nyc-dev
Oren Blasberg [Mon, 8 Feb 2016 23:17:07 +0000 (15:17 -0800)]
Fix vector "right arrow" drawable to be properly 24dp.
This drawable is used for cascading menus. It was 25dp on one dimension
before, for some reason. I verified it looks fine at 24x24.
Change-Id: Iff5d4f00655d77830d9492190b1a74ef6f408f47
(cherry picked from commit
c007e91cc0519adeb4ff35e9e8c436231c2be822)
Oren Blasberg [Tue, 9 Feb 2016 00:57:54 +0000 (00:57 +0000)]
Merge "Fix vector "right arrow" drawable to be properly 24dp."
Zach Alcorn [Tue, 9 Feb 2016 00:55:40 +0000 (00:55 +0000)]
Merge "Document framework metrics meanings."
Jorim Jaggi [Thu, 4 Feb 2016 06:04:22 +0000 (22:04 -0800)]
Put dismiss end target at navigation bar
This makes the animation when exiting docked mode a bit nicer
when you fling the divider towards to the navigation bar. However,
since the divider ends at the navigation bar, we need to immediately
dismiss it instead of fading out when the divider is fully occluded
by the navigation bar.
Change-Id: Ic5432fd118cb71be36485667b2c537caf5065ce5
Tomasz Mikolajewski [Mon, 8 Feb 2016 09:08:18 +0000 (18:08 +0900)]
Cleanup sliding animation between directories.
The shadow is restored + redundant fade removed.
Bug:
26986946
Change-Id: I31dde7d03f60be470e1c5e06dcdce828d3e4eaa0
Phil Weaver [Tue, 2 Feb 2016 22:47:44 +0000 (14:47 -0800)]
Clean up accessibility gestures.
Closing two small holes in the implementation:
1. The gesture was dispatched before the callback was registered. It
was possible for gestures that failed quickly to fail to report any
status.
2. Gestures could be dispatched before the input filter was
installed. Adding a wait to give the filter a chance to install
before reporting a failure.
Also removing an unused method on the input filter.
Change-Id: I77cd80dcd2cec6c72b3761169aba5eaecf62250b
(cherry picked from commit
03465fb874ccf35ead2228b66ec03afc31d7694e)
Phil Weaver [Tue, 9 Feb 2016 00:51:05 +0000 (00:51 +0000)]
Merge "Clean up accessibility gestures."
Chris Craik [Tue, 9 Feb 2016 00:46:08 +0000 (00:46 +0000)]
Revert "Revert "TaskManager bench"" am:
b251a2f51e
am:
b08e8b6fcd
* commit '
b08e8b6fcdcc254ce4b5f3229f23e2be25eed63c':
Revert "Revert "TaskManager bench""
Felipe Leme [Tue, 9 Feb 2016 00:44:54 +0000 (00:44 +0000)]
Merge "Changed list metered-networks so it returns all networks." into nyc-dev am:
12ded41d48
am:
a7ed944b64
* commit '
a7ed944b6419fdede6b8a2c77b2bbb25a7a38eed':
Changed list metered-networks so it returns all networks.
Felipe Leme [Tue, 9 Feb 2016 00:43:43 +0000 (00:43 +0000)]
Merge "Add pid on main bugreport notifications." into nyc-dev am:
000b84451d
am:
75f37009f4
* commit '
75f37009f481d0effcb9b2de12536f10fbb2d9aa':
Add pid on main bugreport notifications.
Tomasz Mikolajewski [Tue, 9 Feb 2016 00:40:39 +0000 (00:40 +0000)]
Merge "Fix animation for the empty cabinet, also make other animations less jarring."
Tomasz Mikolajewski [Tue, 9 Feb 2016 00:37:08 +0000 (00:37 +0000)]
Merge "Remove temporary test fixes."
Phil Weaver [Tue, 9 Feb 2016 00:08:36 +0000 (00:08 +0000)]
Merge "Clean up UiAutomation working alongside a11y."
Jim Miller [Tue, 9 Feb 2016 00:07:09 +0000 (00:07 +0000)]
Merge "Update FBE notification strings"
Chris Craik [Tue, 9 Feb 2016 00:05:15 +0000 (00:05 +0000)]
Revert "Revert "TaskManager bench""
am:
b251a2f51e
* commit '
b251a2f51e636d036598ad27473b9cc55fdac1d7':
Revert "Revert "TaskManager bench""
Svetoslav Ganov [Tue, 9 Feb 2016 00:04:34 +0000 (00:04 +0000)]
Merge "Multi packages per APK" into nyc-dev am:
f2971c45df
am:
9ebeee829c
* commit '
9ebeee829cba860e5106407963be479085e6789d':
Multi packages per APK
Felipe Leme [Tue, 9 Feb 2016 00:03:42 +0000 (00:03 +0000)]
Merge "Changed list metered-networks so it returns all networks." into nyc-dev
am:
12ded41d48
* commit '
12ded41d48f710474f0163746d4c454c976b2fe9':
Changed list metered-networks so it returns all networks.
Siyamed Sinir [Tue, 9 Feb 2016 00:03:00 +0000 (00:03 +0000)]
Merge "Clamp EditText cursor in the drawable boundaries." into nyc-dev am:
f4aa7d2e8a
am:
c1a79aebc2
* commit '
c1a79aebc2378c49b878d561131d895dd471efc8':
Clamp EditText cursor in the drawable boundaries.
Jean-Michel Trivi [Tue, 9 Feb 2016 00:00:41 +0000 (00:00 +0000)]
Merge "Support for Bundle in AudioAttributes" into nyc-dev am:
c315398694
am:
80ede362e4
* commit '
80ede362e493e52d652e32c2f34c56a9811f2d12':
Support for Bundle in AudioAttributes
Felipe Leme [Mon, 8 Feb 2016 23:56:35 +0000 (23:56 +0000)]
Merge "Add pid on main bugreport notifications." into nyc-dev
am:
000b84451d
* commit '
000b84451d6a0b83345421ac1eae4ab402d1b8d3':
Add pid on main bugreport notifications.
Siyamed Sinir [Mon, 8 Feb 2016 23:51:14 +0000 (23:51 +0000)]
Merge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp
am:
bf2239f776
* commit '
bf2239f77672eaf2923014460756ef7a536bf70f':
Svetoslav Ganov [Mon, 8 Feb 2016 23:51:11 +0000 (23:51 +0000)]
Merge "Multi packages per APK" into nyc-dev
am:
f2971c45df
* commit '
f2971c45df3b8a4b2a6e28376b95c2773ffe9e0c':
Multi packages per APK
Siyamed Sinir [Mon, 8 Feb 2016 23:49:34 +0000 (23:49 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Siyamed Sinir [Mon, 8 Feb 2016 23:49:06 +0000 (23:49 +0000)]
Merge "Clamp EditText cursor in the drawable boundaries." into nyc-dev
am:
f4aa7d2e8a
* commit '
f4aa7d2e8a21a3b567af3fc7c38d1e85ff904ed9':
Clamp EditText cursor in the drawable boundaries.
Siyamed Sinir [Mon, 8 Feb 2016 23:47:57 +0000 (23:47 +0000)]
Merge "Do not save TextView text when freezesText is false" into nyc-dev am:
087d7b7c9c
am:
d197ba66b8
* commit '
d197ba66b83509feced4f725d0b605eb13811794':
Do not save TextView text when freezesText is false
Aga Wronska [Mon, 8 Feb 2016 23:47:45 +0000 (23:47 +0000)]
Merge "Improve document rename experience - Initially select the name of the file without extension - Trigger renaming action when software keyboard Done button pressed - Trigger creating new directory when software kayboard Done button pressed"
Jean-Michel Trivi [Mon, 8 Feb 2016 23:47:29 +0000 (23:47 +0000)]
Merge "Support for Bundle in AudioAttributes" into nyc-dev
am:
c315398694
* commit '
c31539869455f5bfb595a3b4b2001ca6a50a098f':
Support for Bundle in AudioAttributes
Aga Wronska [Mon, 8 Feb 2016 23:37:10 +0000 (23:37 +0000)]
Merge "Go to root from child directory when root tapped. Bug:
27060001"
Mihai Niță [Mon, 8 Feb 2016 23:36:33 +0000 (23:36 +0000)]
Merge "Language list heading: add padding and make it bold"
Chris Craik [Mon, 8 Feb 2016 23:32:25 +0000 (23:32 +0000)]
Merge "Fix TextDropShadowCacheTests and glyph_t everywhere" into nyc-dev am:
81ece00790
am:
6480eb6c45
* commit '
6480eb6c45bbd9431a414d755ef69ed13ab0ea9f':
Fix TextDropShadowCacheTests and glyph_t everywhere
Chris Craik [Mon, 8 Feb 2016 23:31:50 +0000 (23:31 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Aga Wronska [Mon, 8 Feb 2016 17:14:25 +0000 (09:14 -0800)]
Improve document rename experience
- Initially select the name of the file without extension
- Trigger renaming action when software keyboard Done button pressed
- Trigger creating new directory when software kayboard Done button pressed
Bug:
26954407
Change-Id: I700d5beacdb98eb0699bbdd4f4bbcafcc1a67e83
Chris Craik [Mon, 8 Feb 2016 23:30:40 +0000 (23:30 +0000)]
Merge "Use clang to build microbench" into nyc-dev am:
edc76fce26
am:
981506f72a
* commit '
981506f72a75645f36f025013adf54687828b7a7':
Use clang to build microbench
Chris Craik [Mon, 8 Feb 2016 23:30:02 +0000 (23:30 +0000)]
Merge "Use clang to build microbench" into nyc-dev am:
edc76fce26
am:
981506f72a
* commit '
981506f72a75645f36f025013adf54687828b7a7':
Use clang to build microbench
Chris Craik [Mon, 8 Feb 2016 19:36:46 +0000 (19:36 +0000)]
Revert "Revert "TaskManager bench""
This reverts commit
9640477e3cc075b0f303e817a3ebcc72d7bc878b.
Change-Id: I3aa8f2830b43b9c7b211c5792a311d0bc698c51a
Felipe Leme [Mon, 8 Feb 2016 23:26:13 +0000 (23:26 +0000)]
Merge "Changed list metered-networks so it returns all networks." into nyc-dev
Felipe Leme [Mon, 8 Feb 2016 23:25:38 +0000 (23:25 +0000)]
Merge "Add pid on main bugreport notifications." into nyc-dev
John Reck [Mon, 8 Feb 2016 23:22:17 +0000 (23:22 +0000)]
Merge "Fix drawing cache on sw drawing" into nyc-dev am:
8f81637a87
am:
167c5b76be
* commit '
167c5b76be038fba621eca65e8c3e81af16ecb0f':
Fix drawing cache on sw drawing
Svetoslav Ganov [Mon, 8 Feb 2016 23:20:50 +0000 (23:20 +0000)]
Merge "Multi packages per APK" into nyc-dev
Abhijith Shastry [Mon, 8 Feb 2016 23:18:53 +0000 (23:18 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Siyamed Sinir [Mon, 8 Feb 2016 23:18:29 +0000 (23:18 +0000)]
Merge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp
Zach Alcorn [Tue, 2 Feb 2016 19:57:55 +0000 (11:57 -0800)]
Document framework metrics meanings.
Change-Id: I5d9be781aecc3cbf8df8e8dc27b6d2bac7e0bf82
Oren Blasberg [Mon, 8 Feb 2016 23:17:07 +0000 (15:17 -0800)]
Fix vector "right arrow" drawable to be properly 24dp.
This drawable is used for cascading menus. It was 25dp on one dimension
before, for some reason. I verified it looks fine at 24x24.
Change-Id: Iff5d4f00655d77830d9492190b1a74ef6f408f47
Abhijith Shastry [Mon, 8 Feb 2016 23:16:57 +0000 (23:16 +0000)]
Merge "Hidden permissions to access blocked numbers." into nyc-dev am:
901bbe0667
am:
2924c464a8
* commit '
2924c464a86f8d137850ccf228b92d061df017ad':
Hidden permissions to access blocked numbers.
Siyamed Sinir [Mon, 8 Feb 2016 23:16:48 +0000 (23:16 +0000)]
Merge "Clamp EditText cursor in the drawable boundaries." into nyc-dev
Siyamed Sinir [Mon, 8 Feb 2016 23:16:38 +0000 (23:16 +0000)]
Merge "Do not save TextView text when freezesText is false" into nyc-dev
am:
087d7b7c9c
* commit '
087d7b7c9cc071ffa5bc0dfbf5b5565f99cd95fe':
Do not save TextView text when freezesText is false
Geoff Mendal [Mon, 8 Feb 2016 23:16:34 +0000 (23:16 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Geoff Mendal [Mon, 8 Feb 2016 23:14:09 +0000 (23:14 +0000)]
Import translations. DO NOT MERGE am:
ac534a6c82 -s ours am:
51734d060e -s ours
am:
c2d28a074e -s ours
* commit '
c2d28a074e33c1d667f5648f49768af1fe43494f':
Import translations. DO NOT MERGE
Svet Ganov [Thu, 17 Dec 2015 19:35:04 +0000 (11:35 -0800)]
Multi packages per APK
This change introduces the ability to have multiple packages per
APK. The feature is currently restricted to privileged apps and
updates to such apps.
In essence the manifest can have multiple child package declarations.
A child package can declare everything an Android package can except
some tags or attributes that are not applicable and instead inherited
from the parent when needed. For example, the target SDK of the parent
applies to all children.
A child package can be updated only through the parent package.
A package with multiple child packages is installed, uninstalled
atomically - no partial installs where some child packages are not
installed.
The remaining work is to ensure broadcasts are also sent for child
packages. This will come in a subsequent change.
Sample app:ag/848432
Design doc: https://docs.google.com/document/d/18nFWtJuZchLxrHf5SBbJW03-Ky9Rh_G0-OVB14b6u78
Change-Id: I6fd021d981bf5786290e0c53502724a14c97358c
Jean-Michel Trivi [Mon, 8 Feb 2016 23:13:19 +0000 (23:13 +0000)]
Merge "Support for Bundle in AudioAttributes" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 23:12:03 +0000 (23:12 +0000)]
Import translations. DO NOT MERGE am:
ac534a6c82 -s ours am:
51734d060e -s ours
am:
c2d28a074e -s ours
* commit '
c2d28a074e33c1d667f5648f49768af1fe43494f':
Import translations. DO NOT MERGE
Siyamed Sinir [Mon, 8 Feb 2016 23:11:56 +0000 (23:11 +0000)]
Merge "Do not save TextView text when freezesText is false" into nyc-dev
am:
087d7b7c9c
* commit '
087d7b7c9cc071ffa5bc0dfbf5b5565f99cd95fe':
Do not save TextView text when freezesText is false
Amit Mahajan [Mon, 8 Feb 2016 23:07:18 +0000 (23:07 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Amit Mahajan [Mon, 8 Feb 2016 23:05:29 +0000 (23:05 +0000)]
Make permission RECEIVE_EMERGENCY_BROADCAST public. am:
c08268e647
am:
510e0ee392
* commit '
510e0ee39276fb687d50874b4f3097313a195e2b':
Make permission RECEIVE_EMERGENCY_BROADCAST public.
Amit Mahajan [Mon, 8 Feb 2016 23:05:08 +0000 (23:05 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Aga Wronska [Mon, 8 Feb 2016 20:00:38 +0000 (12:00 -0800)]
Go to root from child directory when root tapped.
Bug:
27060001
Change-Id: Iabe1f9f2c986904a4d827e74cf29b3de55e74f90
Amit Mahajan [Mon, 8 Feb 2016 23:02:41 +0000 (23:02 +0000)]
Make permission RECEIVE_EMERGENCY_BROADCAST public. am:
c08268e647
am:
510e0ee392
* commit '
510e0ee39276fb687d50874b4f3097313a195e2b':
Make permission RECEIVE_EMERGENCY_BROADCAST public.
Chris Craik [Mon, 8 Feb 2016 23:02:06 +0000 (23:02 +0000)]
Merge "Fix TextDropShadowCacheTests and glyph_t everywhere" into nyc-dev
am:
81ece00790
* commit '
81ece007908fa28213f01bca908fc457a7b0a6d1':
Fix TextDropShadowCacheTests and glyph_t everywhere
Tao Bao [Mon, 8 Feb 2016 23:02:03 +0000 (23:02 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Tao Bao [Mon, 8 Feb 2016 22:59:28 +0000 (22:59 +0000)]
Merge "Add system APIs for A/B update." into nyc-dev am:
6af1d75a0c
am:
bfc03b7a93
* commit '
bfc03b7a93a26ed26fcc0516436e383b0106175e':
Add system APIs for A/B update.
Chris Craik [Mon, 8 Feb 2016 22:59:25 +0000 (22:59 +0000)]
Merge "Use clang to build microbench" into nyc-dev
am:
edc76fce26
* commit '
edc76fce2632d8fd3e32c07121af3ec355cc336e':
Use clang to build microbench
Tao Bao [Mon, 8 Feb 2016 22:57:31 +0000 (22:57 +0000)]
Merge "Add system APIs for A/B update." into nyc-dev am:
6af1d75a0c
am:
bfc03b7a93
* commit '
bfc03b7a93a26ed26fcc0516436e383b0106175e':
Add system APIs for A/B update.
John Reck [Mon, 8 Feb 2016 22:55:25 +0000 (22:55 +0000)]
Merge "Fix drawing cache on sw drawing" into nyc-dev
am:
8f81637a87
* commit '
8f81637a8707dae992c94dfd891af4420815ece4':
Fix drawing cache on sw drawing
Paul Crowley [Mon, 8 Feb 2016 22:53:02 +0000 (22:53 +0000)]
Merge "Password security for FBE disk encryption keys" into nyc-dev am:
23b588c7b3
am:
d386008899
* commit '
d386008899ff359a0e8cea629523d6bf305896b9':
Password security for FBE disk encryption keys
Abhijith Shastry [Mon, 8 Feb 2016 22:52:55 +0000 (22:52 +0000)]
Merge "Hidden permissions to access blocked numbers." into nyc-dev
am:
901bbe0667
* commit '
901bbe066762a644ec0790de8b07199f4464bb4f':
Hidden permissions to access blocked numbers.
Jae Seo [Sat, 6 Feb 2016 02:11:35 +0000 (11:11 +0900)]
TIF: Allow the application to indicate a TV program to record
Bug:
26962040
Change-Id: I2f062a4621c8a9a6765543826ba2cd607f1468d4
Siyamed Sinir [Mon, 8 Feb 2016 22:51:31 +0000 (22:51 +0000)]
Merge "Do not save TextView text when freezesText is false" into nyc-dev
Wale Ogunwale [Mon, 8 Feb 2016 22:51:23 +0000 (22:51 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Wale Ogunwale [Mon, 8 Feb 2016 22:49:24 +0000 (22:49 +0000)]
Merge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp
am:
6845ea8681
* commit '
6845ea868194226768e119a9fa1fca3ad0a1e7b3':
Chris Craik [Mon, 8 Feb 2016 22:47:34 +0000 (22:47 +0000)]
Merge "Fix TextDropShadowCacheTests and glyph_t everywhere" into nyc-dev
Chris Craik [Mon, 8 Feb 2016 22:46:52 +0000 (22:46 +0000)]
Merge "Use clang to build microbench" into nyc-dev
Wale Ogunwale [Mon, 8 Feb 2016 22:46:43 +0000 (22:46 +0000)]
Merge branch \'nyc-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp
am:
6845ea8681
* commit '
6845ea868194226768e119a9fa1fca3ad0a1e7b3':
Geoff Mendal [Mon, 8 Feb 2016 22:46:23 +0000 (22:46 +0000)]
Import translations. DO NOT MERGE am:
ac534a6c82 -s ours
am:
51734d060e -s ours
* commit '
51734d060ec6b085c8a1c03ab4525c8c34342d57':
Import translations. DO NOT MERGE
John Reck [Mon, 8 Feb 2016 22:46:09 +0000 (22:46 +0000)]
Merge "Fix drawing cache on sw drawing" into nyc-dev
Chris Craik [Sat, 6 Feb 2016 04:10:50 +0000 (20:10 -0800)]
Fix TextDropShadowCacheTests and glyph_t everywhere
Change-Id: I943eae4e9408c77bdfba6304ba7ee3e862351a41
Chris Craik [Sat, 6 Feb 2016 02:03:36 +0000 (18:03 -0800)]
Use clang to build microbench
Change-Id: I7ae8049fe05e99fadf905abd18553cb28596ba7f
Wale Ogunwale [Mon, 8 Feb 2016 22:44:15 +0000 (22:44 +0000)]
Fixed issue with drag resize state when animating pinned stack. am:
ce14452a27
am:
90dd5cc30f
* commit '
90dd5cc30f35fe2e9ec078219a431a96893ba443':
Fixed issue with drag resize state when animating pinned stack.
Amit Mahajan [Mon, 8 Feb 2016 22:43:58 +0000 (22:43 +0000)]
Make permission RECEIVE_EMERGENCY_BROADCAST public.
am:
c08268e647
* commit '
c08268e647f89f8ddfd9c6fb1f6ac4f99b13b9cf':
Make permission RECEIVE_EMERGENCY_BROADCAST public.
OSDN Git Service
