John Reck
9f091287b1
Merge "Free DisplayListData for Views with GONE parents"
2015-10-28 19:20:49 +00:00
John Reck
9dea0d53f5
Free DisplayListData for Views with GONE parents
...
Bug: 22565656
Change-Id: I06060e6ae473482ec79feb891f9123c85706237f
2015-10-28 12:20:20 -07:00
Geoff Mendal
39baa9d45b
Merge "Import translations. DO NOT MERGE"
2015-10-28 19:14:30 +00:00
Jason Monk
7917546d0e
Merge "Some header layout cleanup and alignment"
2015-10-28 19:13:58 +00:00
Geoff Mendal
7d0a01ea47
Import translations. DO NOT MERGE
...
Change-Id: I0bd4c7f9ebf574e04f4717cff2dc5f2b25920bbf
Auto-generated-cl: translation import
2015-10-28 12:12:07 -07:00
Anthony Hugh
6cb3ee8319
Merge "Update permission label strings" into cw-e-dev am: b69cab65d1 am: 41579ff8fc
...
am: d592a5a43a
* commit 'd592a5a43ac9fa922c8747f2ff6e65cb27ff0b75':
Update permission label strings
2015-10-28 18:47:53 +00:00
Anthony Hugh
d592a5a43a
Merge "Update permission label strings" into cw-e-dev am: b69cab65d1
...
am: 41579ff8fc
* commit '41579ff8fc06ad655e158b1ab825624437489c83':
Update permission label strings
2015-10-28 18:38:32 +00:00
Anthony Hugh
41579ff8fc
Merge "Update permission label strings" into cw-e-dev
...
am: b69cab65d1
* commit 'b69cab65d180c3166ac84e47da0aa0c1c27bbc67':
Update permission label strings
2015-10-28 18:29:06 +00:00
Anthony Hugh
b69cab65d1
Merge "Update permission label strings" into cw-e-dev
2015-10-28 18:22:41 +00:00
Tom Hudson
37028137f2
Merge "Merge six commits from master-skia to master"
2015-10-28 17:56:10 +00:00
Ching Tzung Lin
e29953c175
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am: 36da2a208e am: c45009906a
...
am: a05beb29da
* commit 'a05beb29dac5c05a610783469566cf865d92a140':
Consolidates config_windowOutsetBottom and circular_display_mask_offset
2015-10-28 17:48:28 +00:00
Chris Craik
346b38cd10
Merge "Rework receiver/dispatcher design slightly, and replace Layer usage."
2015-10-28 17:43:11 +00:00
Leon Scroggins III
550780745f
Merge six commits from master-skia to master
...
Include external/skia/include/private
use SrcConstraint for drawBitmapRect
clean up to allow removal of flags for SCALAR_DIV and IMAGEINFO_FIELDS
don't call DEPRECATED getDevice()
update to newer API for drawBitmapRect
asABitmap is deprecated, used isABitmap
Change-Id: I519f54f97321a7a365ea81a3b78cb03b9bdca021
previous-Change-Id: I12208855a95948897077b1c1549eb35416cc801e
previous-Change-Id: I5044f0f61315fe48c60d7af5e261a7d0ed574f56
previous-Change-Id: Ic34a3ba77b3f9e091fa7aaba75018a307abacdab
previous-Change-Id: I79f8dd779920565d1204f7fe67b3286b1bbf4e9b
previous-Change-Id: Ic04d1f8274f6a862ea00f8d241363cf31f5ec1ec
previous-Change-Id: I9e4ae257a1976c74302b6a73f17405174ae58cec
2015-10-28 13:41:38 -04:00
Ching Tzung Lin
a05beb29da
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am: 36da2a208e
...
am: c45009906a
* commit 'c45009906ade7b25b6c01c02113c044bd9290ffb':
Consolidates config_windowOutsetBottom and circular_display_mask_offset
2015-10-28 17:41:24 +00:00
Ching Tzung Lin
c45009906a
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
...
am: 36da2a208e
* commit '36da2a208e253d0635bb569cb92ea0e11f489b4e':
Consolidates config_windowOutsetBottom and circular_display_mask_offset
2015-10-28 17:33:03 +00:00
Ching Tzung Lin
36da2a208e
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
2015-10-28 17:25:24 +00:00
Makoto Onuki
ec721632d1
Merge "Fix javadoc"
2015-10-28 17:20:03 +00:00
Makoto Onuki
a3c1250a2f
Fix javadoc
...
Change-Id: Iade890cd14bcac844f8ccc1ddde90120600fd64a
2015-10-28 10:18:32 -07:00
Fyodor Kupolov
9147ce4cf9
Merge "Enable default system IMEs for system user"
2015-10-28 17:05:58 +00:00
Winson Chung
91068127c5
Merge "Re-enabling docking on left/right on tablets in landscape."
2015-10-28 16:50:46 +00:00
Winson
e92440ee5f
Re-enabling docking on left/right on tablets in landscape.
...
Change-Id: I3b02f5bbd653ea79a0d148e5454bd5755c85aba7
2015-10-28 09:48:47 -07:00
Dongwon Kang
164fa97ae8
Merge "MediaBrowser: Fix a wrong ISE message"
2015-10-28 16:14:52 +00:00
Geoff Mendal
4503d2f14a
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c -s ours am: d2b3815dda -s ours am: 9aa91f99b2 -s ours
...
am: 4fcebfe20e -s ours
* commit '4fcebfe20e9c7b76ebc6c14fe6adf9fef2f072f9':
Import translations. DO NOT MERGE
2015-10-28 15:06:50 +00:00
Geoff Mendal
4fcebfe20e
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c -s ours am: d2b3815dda -s ours
...
am: 9aa91f99b2 -s ours
* commit '9aa91f99b26ddac01c7045e1a18b6f0116b4eec7':
Import translations. DO NOT MERGE
2015-10-28 15:00:44 +00:00
Geoff Mendal
9aa91f99b2
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c -s ours
...
am: d2b3815dda -s ours
* commit 'd2b3815dda57702ebbd00a6422d21a52b0604dfa':
Import translations. DO NOT MERGE
2015-10-28 14:52:31 +00:00
Geoff Mendal
fed5f90a16
Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a4f0ea406d -s ours am: 4c55431f51 -s ours
...
am: a4993f6f2f -s ours
* commit 'a4993f6f2f71c370b5622843ab8f2587b46d8dbd':
Import translations. DO NOT MERGE
2015-10-28 14:48:06 +00:00
Geoff Mendal
d2b3815dda
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
am: c7522c0b1c -s ours
* commit 'c7522c0b1c3b8f445ddc1b75f0600363ecbd27a6':
Import translations. DO NOT MERGE
2015-10-28 14:43:38 +00:00
Geoff Mendal
a4993f6f2f
Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a4f0ea406d -s ours
...
am: 4c55431f51 -s ours
* commit '4c55431f51a3c3c67b3234e4902e7fda5cb81c76':
Import translations. DO NOT MERGE
2015-10-28 14:39:12 +00:00
Geoff Mendal
c7522c0b1c
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-10-28 14:38:11 +00:00
Geoff Mendal
bcefa34c3f
Import translations. DO NOT MERGE
...
Change-Id: Id9e2298a05893e3769f0e62bcda5fe70c058d11a
Auto-generated-cl: translation import
2015-10-28 07:37:31 -07:00
Geoff Mendal
bc9ce6e440
Import translations. DO NOT MERGE am: b8afc77c0a -s ours am: 7934d4e206 -s ours am: 32076214a4 -s ours
...
am: e21f906153 -s ours
* commit 'e21f906153f935a9bcdb2f7723bcdbb7b48c5bdf':
Import translations. DO NOT MERGE
2015-10-28 14:33:48 +00:00
Geoff Mendal
4c55431f51
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: a4f0ea406d -s ours
* commit 'a4f0ea406d9c4de166ec65541581666e782b3846':
Import translations. DO NOT MERGE
2015-10-28 14:29:50 +00:00
Geoff Mendal
e21f906153
Import translations. DO NOT MERGE am: b8afc77c0a -s ours am: 7934d4e206 -s ours
...
am: 32076214a4 -s ours
* commit '32076214a40a98553a7c634d8d8a8d1eb2efb625':
Import translations. DO NOT MERGE
2015-10-28 14:26:00 +00:00
Geoff Mendal
a4f0ea406d
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-10-28 14:22:47 +00:00
Geoff Mendal
c3b637f8d1
Import translations. DO NOT MERGE
...
Change-Id: I9c1726898d50ea8971a12ddc9fe575615682f95d
Auto-generated-cl: translation import
2015-10-28 07:21:49 -07:00
Geoff Mendal
32076214a4
Import translations. DO NOT MERGE am: b8afc77c0a -s ours
...
am: 7934d4e206 -s ours
* commit '7934d4e20603eb2aaa6f6041c932e9ef70b5612f':
Import translations. DO NOT MERGE
2015-10-28 14:18:25 +00:00
Geoff Mendal
7934d4e206
Import translations. DO NOT MERGE
...
am: b8afc77c0a -s ours
* commit 'b8afc77c0a20a5d4ff7d1afb060c474feeefb1fe':
Import translations. DO NOT MERGE
2015-10-28 14:11:00 +00:00
Geoff Mendal
b8afc77c0a
Import translations. DO NOT MERGE
...
Change-Id: If7c4ccf382e85f88a4fac586ca870068d8219974
Auto-generated-cl: translation import
2015-10-28 06:59:45 -07:00
Geoff Mendal
d0d316049d
Merge "Import translations. DO NOT MERGE"
2015-10-28 13:03:57 +00:00
Geoff Mendal
52dfbe95c1
Import translations. DO NOT MERGE
...
Change-Id: I9cadfa4b07bca2d001bef84944b1b7a226b2d3aa
Auto-generated-cl: translation import
2015-10-28 06:02:30 -07:00
Geoff Mendal
cd3a0e17f0
Merge "Import translations. DO NOT MERGE"
2015-10-28 12:42:13 +00:00
Geoff Mendal
78210c34ab
Import translations. DO NOT MERGE
...
Change-Id: I9971ad4dba7f72bb883288a49020eb115e2fb34f
Auto-generated-cl: translation import
2015-10-28 05:38:36 -07:00
Geoff Mendal
c1741a1e40
Import translations. DO NOT MERGE am: 44036023a5 -s ours am: 5d79e1b9c1 -s ours
...
am: 0c79b15f31 -s ours
* commit '0c79b15f31489e5c0491fecb000608cb440c8267':
Import translations. DO NOT MERGE
2015-10-28 12:37:34 +00:00
Geoff Mendal
0c79b15f31
Import translations. DO NOT MERGE am: 44036023a5 -s ours
...
am: 5d79e1b9c1 -s ours
* commit '5d79e1b9c1129a60663fca69892ebc14270e5d87':
Import translations. DO NOT MERGE
2015-10-28 12:30:10 +00:00
Geoff Mendal
5d79e1b9c1
Import translations. DO NOT MERGE
...
am: 44036023a5 -s ours
* commit '44036023a574fa8526c6b436ff5309d5939c94cd':
Import translations. DO NOT MERGE
2015-10-28 12:21:45 +00:00
Geoff Mendal
44036023a5
Import translations. DO NOT MERGE
...
Change-Id: I0fba6c467156c09874291320bf9f18d13e4ba466
Auto-generated-cl: translation import
2015-10-28 05:13:26 -07:00
Erik Kline
7ae47acb0b
Merge "Also treat loss of IPv6 as a loss of provisioning."
2015-10-28 07:07:51 +00:00
Daniel Sandler
556c8e6466
Merge "Petites fautes." into mnc-dr-dev am: da43cc0a21 am: 21858e56d6 -s ours am: 638003c4fd
...
am: df8b5a48cb
* commit 'df8b5a48cb6e155688e4ab95fc24187fa3ef8027':
Petites fautes.
2015-10-28 03:38:12 +00:00
Daniel Sandler
df8b5a48cb
Merge "Petites fautes." into mnc-dr-dev am: da43cc0a21 am: 21858e56d6 -s ours
...
am: 638003c4fd
* commit '638003c4fdf959686ba35d19cb99805d3c5f578c':
Petites fautes.
2015-10-28 03:30:40 +00:00
Daniel Sandler
638003c4fd
Merge "Petites fautes." into mnc-dr-dev am: da43cc0a21
...
am: 21858e56d6 -s ours
* commit '21858e56d640109e36b2f02e244e125adf37020c':
Petites fautes.
2015-10-28 03:21:35 +00:00
