OSDN Git Service
Bill Yi [Fri, 2 Sep 2016 20:02:55 +0000 (20:02 +0000)]
Import translations. DO NOT MERGE am:
d341e0f050 -s ours am:
05af4b26b6 -s ours
am:
d9ae4b7b78 -s ours
Change-Id: I63d17a65eb2a43872d37b1d0ed7db04f45025127
Michael Kwan [Fri, 2 Sep 2016 20:02:44 +0000 (20:02 +0000)]
Merge "Merge "Update normal dark button colour to match UX specs." into cw-f-dev am:
2d5bbf7d92" into nyc-mr1-dev-plus-aosp
am:
deb155ab96
Change-Id: I5eecb7dd78048d24c9e2a5ffa2ec6ae1b5f6d20f
Michael Kwan [Fri, 2 Sep 2016 20:02:39 +0000 (20:02 +0000)]
Merge "Update normal dark button colour to match UX specs." into cw-f-dev am:
2d5bbf7d92
am:
67474b01f1
Change-Id: Ibf039f54097e5987bb92dc2986131a97c901b0f5
Michael Kwan [Fri, 2 Sep 2016 20:02:30 +0000 (20:02 +0000)]
Merge "Update normal dark button colour to match UX specs. am:
9f175654b3" into nyc-mr1-dev-plus-aosp
am:
82f608c3e0
Change-Id: If5098d6da0171270f4cd234d2480262de845ab27
Michael Kwan [Fri, 2 Sep 2016 20:02:25 +0000 (20:02 +0000)]
Update normal dark button colour to match UX specs. am:
9f175654b3
am:
6b07dffd80
Change-Id: Id1bff1a0b116e5b00d3b9479c2e9d91c32382adc
Jason Monk [Fri, 2 Sep 2016 20:02:16 +0000 (20:02 +0000)]
Merge "Add branded VPN messages to go along with branded icons am:
802bc6ee06 am:
57bf03152c" into nyc-mr1-dev-plus-aosp
am:
19602e0344
Change-Id: I30f6a5d528f9ad549d0ecdcc1ec6ae2a1f5ebb59
Jason Monk [Fri, 2 Sep 2016 19:59:51 +0000 (19:59 +0000)]
Add branded VPN messages to go along with branded icons am:
802bc6ee06 am:
57bf03152c
am:
cd72f9a1ce
Change-Id: Iad0153394159f46ef3838087a3749b57d60b3986
Sooraj Sasindran [Fri, 2 Sep 2016 18:56:41 +0000 (18:56 +0000)]
Merge "Expose api to retrieve wakelock information per client"
Adam Lesinski [Fri, 2 Sep 2016 18:49:43 +0000 (18:49 +0000)]
Merge "AAPT2: Add Inline Complex XML support"
TreeHugger Robot [Fri, 2 Sep 2016 18:12:51 +0000 (18:12 +0000)]
Merge "Add optional logging to investigate URI grants."
Bill Yi [Fri, 2 Sep 2016 17:54:19 +0000 (17:54 +0000)]
Merge changes from topic 'fb-new-project' into stage-aosp-master am:
c3099c0428 am:
da42c6999c
am:
5b683ac2f2
Change-Id: I53beb8793d989d7551424d33f70537b3704a6302
Martijn Coenen [Fri, 2 Sep 2016 17:53:49 +0000 (17:53 +0000)]
Move Status to libhidl (DO NOT MERGE) am:
d713c4c39e -s ours am:
02679c9c1a
am:
b5420d64ef -s ours
Change-Id: Ia7da86c23c026b0a60a0014a5f9d2cbff09ffbb3
Andreas Huber [Fri, 2 Sep 2016 17:52:43 +0000 (17:52 +0000)]
Adds framework support for hidl-gen Java backend. (to support structs) (DO NOT MERGE) am:
54e4578e60 -s ours am:
1598a8bc3d
am:
d570ab5dcf -s ours
Change-Id: Ibc8e467c5aeb82867729c9163fdd2e298920e6a8
Andreas Huber [Fri, 2 Sep 2016 17:51:44 +0000 (17:51 +0000)]
Add Bool* APIs to HwParcel (DO NOT MERGE) am:
52073b842f -s ours am:
e5331f5ea5
am:
f9d094c529 -s ours
Change-Id: I65f3f525cd1450524c9bd3309ecc180dfcb1f2a9
Martijn Coenen [Fri, 2 Sep 2016 17:51:07 +0000 (17:51 +0000)]
Link against libhidl for HidlSupport/svcmgr (DO NOT MERGE) am:
83c42506a7 -s ours am:
c7a710639d
am:
401a7d8288 -s ours
Change-Id: Ic05162247b603085cc144e82b60a697f641fccda
Andreas Huber [Fri, 2 Sep 2016 17:50:30 +0000 (17:50 +0000)]
Support one-way methods in java support for hardware binder (DO NOT MERGE) am:
ea2ae56e03 -s ours am:
22b01080cb
am:
4921ae67b5 -s ours
Change-Id: I1b28baaa41ed67b9e8ce1a098c1d4ee76db81860
Andreas Huber [Fri, 2 Sep 2016 17:49:11 +0000 (17:49 +0000)]
Initial commit of Java support for hardware binder (DO NOT MERGE) am:
0619b33685 -s ours am:
bbbe668594
am:
aefc9222ef -s ours
Change-Id: I5eeca2ddd23a5a777823a374f6ad3b60b17312b8
Android Build Merger (Role) [Fri, 2 Sep 2016 17:43:43 +0000 (17:43 +0000)]
Merge "Merge "Update normal dark button colour to match UX specs." into cw-f-dev am:
2d5bbf7d92" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 2 Sep 2016 17:43:32 +0000 (17:43 +0000)]
Merge "Update normal dark button colour to match UX specs. am:
9f175654b3" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 2 Sep 2016 17:43:18 +0000 (17:43 +0000)]
Merge "Add branded VPN messages to go along with branded icons am:
802bc6ee06 am:
57bf03152c" into nyc-mr1-dev-plus-aosp
Bill Yi [Fri, 2 Sep 2016 17:41:49 +0000 (17:41 +0000)]
Import translations. DO NOT MERGE am:
d341e0f050 -s ours
am:
05af4b26b6 -s ours
Change-Id: Id48f744b1961f824539a24784b0ff005eb445310
Michael Kwan [Fri, 2 Sep 2016 17:41:39 +0000 (17:41 +0000)]
Merge "Update normal dark button colour to match UX specs." into cw-f-dev
am:
2d5bbf7d92
Change-Id: I81f0b5ceaacf3b972fe08fd512b32dd73ecb050d
Michael Kwan [Fri, 2 Sep 2016 17:41:36 +0000 (17:41 +0000)]
Update normal dark button colour to match UX specs.
am:
9f175654b3
Change-Id: I79be0f5513dee5550f913c09c1ca5ec282993511
Jason Monk [Fri, 2 Sep 2016 17:41:17 +0000 (17:41 +0000)]
Add branded VPN messages to go along with branded icons am:
802bc6ee06
am:
57bf03152c
Change-Id: Ib35414d8234ca086c2a7e629ea756a5dd2c3cd5b
Bill Yi [Fri, 2 Sep 2016 17:39:37 +0000 (17:39 +0000)]
Merge changes from topic 'fb-new-project' into stage-aosp-master am:
c3099c0428
am:
da42c6999c
Change-Id: Ic2c7213303c32d826a55cc55092e04ddb2260ffd
Martijn Coenen [Fri, 2 Sep 2016 17:38:41 +0000 (17:38 +0000)]
Move Status to libhidl (DO NOT MERGE) am:
d713c4c39e -s ours
am:
02679c9c1a
Change-Id: I4151df009d177e1840eb226ec7141dc2d96e1fae
Andreas Huber [Fri, 2 Sep 2016 17:38:11 +0000 (17:38 +0000)]
Adds framework support for hidl-gen Java backend. (to support structs) (DO NOT MERGE) am:
54e4578e60 -s ours
am:
1598a8bc3d
Change-Id: I8979af100b56855fef1573c0e68a3c68bc3c7e69
Andreas Huber [Fri, 2 Sep 2016 17:37:39 +0000 (17:37 +0000)]
Add Bool* APIs to HwParcel (DO NOT MERGE) am:
52073b842f -s ours
am:
e5331f5ea5
Change-Id: Id7671daa27afcad3f34645dc2a107dea04391d69
Martijn Coenen [Fri, 2 Sep 2016 17:37:09 +0000 (17:37 +0000)]
Link against libhidl for HidlSupport/svcmgr (DO NOT MERGE) am:
83c42506a7 -s ours
am:
c7a710639d
Change-Id: I6b106005699f08414d8ad851fe6ce14e7c2e91b3
Andreas Huber [Fri, 2 Sep 2016 17:36:26 +0000 (17:36 +0000)]
Support one-way methods in java support for hardware binder (DO NOT MERGE) am:
ea2ae56e03 -s ours
am:
22b01080cb
Change-Id: I05a72fc96f0b71ec4e2ba37c56488ddf8dec08ba
Andreas Huber [Fri, 2 Sep 2016 17:35:06 +0000 (17:35 +0000)]
Initial commit of Java support for hardware binder (DO NOT MERGE) am:
0619b33685 -s ours
am:
bbbe668594
Change-Id: Ibb3190a22ac05057017c6a3f3f0e4f02d0ae4731
Bill Yi [Fri, 2 Sep 2016 17:27:42 +0000 (17:27 +0000)]
Merge changes from topic 'fb-new-project' into stage-aosp-master
am:
c3099c0428
Change-Id: I83d9df1877a11a408d4decc0695025108dfa130c
Martijn Coenen [Fri, 2 Sep 2016 17:27:38 +0000 (17:27 +0000)]
Move Status to libhidl (DO NOT MERGE)
am:
d713c4c39e -s ours
Change-Id: I131a4abeaf93fcc7371952c882e8657e388843b9
Andreas Huber [Fri, 2 Sep 2016 17:27:13 +0000 (17:27 +0000)]
Adds framework support for hidl-gen Java backend. (to support structs) (DO NOT MERGE)
am:
54e4578e60 -s ours
Change-Id: I11d26772f9b4ac434e3c821d28a10a616c5be3ae
Andreas Huber [Fri, 2 Sep 2016 17:26:46 +0000 (17:26 +0000)]
Add Bool* APIs to HwParcel (DO NOT MERGE)
am:
52073b842f -s ours
Change-Id: I42b18c17d92991195562de5be410099ab76b8f20
Martijn Coenen [Fri, 2 Sep 2016 17:25:57 +0000 (17:25 +0000)]
Link against libhidl for HidlSupport/svcmgr (DO NOT MERGE)
am:
83c42506a7 -s ours
Change-Id: I60cc69e0104cb762277d214958d8f3150c5f607d
Andreas Huber [Fri, 2 Sep 2016 17:24:48 +0000 (17:24 +0000)]
Support one-way methods in java support for hardware binder (DO NOT MERGE)
am:
ea2ae56e03 -s ours
Change-Id: Ia9219d9ad6ec4fecbe087749402cc73579510ff7
Andreas Huber [Fri, 2 Sep 2016 17:24:20 +0000 (17:24 +0000)]
Initial commit of Java support for hardware binder (DO NOT MERGE)
am:
0619b33685 -s ours
Change-Id: I1db7751ebde7b1e24fec86b1fff59c414ea308b3
Bill Yi [Fri, 2 Sep 2016 17:19:29 +0000 (17:19 +0000)]
Merge changes from topic 'fb-new-project' into stage-aosp-master
* changes:
Move Status to libhidl (DO NOT MERGE)
Adds framework support for hidl-gen Java backend. (to support structs) (DO NOT MERGE)
Add Bool* APIs to HwParcel (DO NOT MERGE)
Link against libhidl for HidlSupport/svcmgr (DO NOT MERGE)
Support one-way methods in java support for hardware binder (DO NOT MERGE)
Initial commit of Java support for hardware binder (DO NOT MERGE)
John Reck [Fri, 2 Sep 2016 15:20:33 +0000 (15:20 +0000)]
Merge "Fix EGLImage memory leak"
Roshan Pius [Fri, 2 Sep 2016 07:38:55 +0000 (07:38 +0000)]
Merge commit '
3f3ed24' into stage-aosp-master am:
e9b6029153 am:
756cbb248e
am:
e500e63cc0
Change-Id: I2081c82b569d21b7fceb446ee82f67410ee17266
Roshan Pius [Fri, 2 Sep 2016 07:32:34 +0000 (07:32 +0000)]
Merge commit '
3f3ed24' into stage-aosp-master am:
e9b6029153
am:
756cbb248e
Change-Id: I8d6ad1bcd2c41553ced95c9f59e8a35889d24edf
Roshan Pius [Fri, 2 Sep 2016 07:26:21 +0000 (07:26 +0000)]
Merge commit '
3f3ed24' into stage-aosp-master
am:
e9b6029153
Change-Id: Ife13a5773b542f9af317296addb70d753e64f69b
The Android Automerger [Fri, 2 Sep 2016 07:19:56 +0000 (07:19 +0000)]
Merge commit '
3f3ed24' into stage-aosp-master
Treehugger Robot [Fri, 2 Sep 2016 05:14:41 +0000 (05:14 +0000)]
Merge "NetworkSelectionStatus: Fix copy constructor"
TreeHugger Robot [Fri, 2 Sep 2016 03:37:13 +0000 (03:37 +0000)]
Merge "Update Bluetooth toggle UI to UX spec - framework"
TreeHugger Robot [Fri, 2 Sep 2016 02:55:11 +0000 (02:55 +0000)]
Merge "MediaBrowser: Make ItemCallback can take a null media item"
TreeHugger Robot [Fri, 2 Sep 2016 02:39:59 +0000 (02:39 +0000)]
Merge changes Ia13c8ed5,Ia82aedfd,I99ca0d18
* changes:
Removed debug code that is never.
Switched WindowToken/AppWindowToken to use WindowContainer
Removed child windows from WindowToken window list
Martijn Coenen [Wed, 31 Aug 2016 23:37:05 +0000 (01:37 +0200)]
Move Status to libhidl (DO NOT MERGE)
Bug:
31226252
Change-Id: Ieb0adcf1fa71d6859324c2d83841685d1e1a22f8
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andreas Huber [Thu, 25 Aug 2016 18:21:21 +0000 (11:21 -0700)]
Adds framework support for hidl-gen Java backend. (to support structs) (DO NOT MERGE)
Bug:
30575790
Change-Id: Ida30d8fe7a1b210e98f1a0ea5d429a0112f9ef3f
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andreas Huber [Wed, 24 Aug 2016 23:19:03 +0000 (16:19 -0700)]
Add Bool* APIs to HwParcel (DO NOT MERGE)
Bug:
31045584
Change-Id: I202c4aa7caf92a4cd7e3a45ef6784638e41facc8
Signed-off-by: Iliyan Malchev <malchev@google.com>
Martijn Coenen [Fri, 19 Aug 2016 12:23:42 +0000 (14:23 +0200)]
Link against libhidl for HidlSupport/svcmgr (DO NOT MERGE)
Bug:
30839546
Change-Id: I52609576aa7f10da608725ef4ea78b778f127eef
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andreas Huber [Thu, 18 Aug 2016 21:29:40 +0000 (14:29 -0700)]
Support one-way methods in java support for hardware binder (DO NOT MERGE)
Bug:
30922538
Change-Id: I5ff93126a29f6bff42dee3f9868fa794ca7c077f
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andreas Huber [Mon, 15 Aug 2016 16:25:02 +0000 (09:25 -0700)]
Initial commit of Java support for hardware binder (DO NOT MERGE)
Change-Id: If1098ab921a11bae8eca2a70a3c3070e4daa0ea2
Wale Ogunwale [Fri, 26 Aug 2016 18:53:16 +0000 (11:53 -0700)]
Removed debug code that is never.
We have never enabled this in all my time on the team, so instead
of including it in the re-factoring I am doing I am just goint to
remove it.
Change-Id: Ia13c8ed53e4771b0cc70834692f31afd972421ef
Wale Ogunwale [Tue, 16 Aug 2016 10:19:39 +0000 (03:19 -0700)]
Switched WindowToken/AppWindowToken to use WindowContainer
Bug:
30060889
Change-Id: Ia82aedfd9ea86410acdcd3a55a7a7fc456be2fc3
Wale Ogunwale [Wed, 10 Aug 2016 21:44:22 +0000 (14:44 -0700)]
Removed child windows from WindowToken window list
With the window container hierarchy model, containers should only
link to their direct children and delegate any operation on
decendants of their children to their children.
Bug:
30060889
Change-Id: I99ca0d181d54cfe75bbe24c1b0daaa06cf7cfd9a
Svet Ganov [Thu, 1 Sep 2016 23:32:13 +0000 (16:32 -0700)]
Update Bluetooth toggle UI to UX spec - framework
Change-Id: Iaaf9d3801a721f15ad7019bca59f235e4de3e2a7
TreeHugger Robot [Thu, 1 Sep 2016 23:29:02 +0000 (23:29 +0000)]
Merge "Fix UserManagerTest#testGetUserCreationTime."
Roshan Pius [Tue, 30 Aug 2016 16:48:47 +0000 (09:48 -0700)]
NetworkSelectionStatus: Fix copy constructor
Add one more missing element from NetworkSelectionStatus copy constructor.
BUG:
31102798
Change-Id: Iae18f944e7ef722b280b20a51f128f90b2ff45c7
TreeHugger Robot [Thu, 1 Sep 2016 21:02:47 +0000 (21:02 +0000)]
Merge "Mock PackageManager for TileLifecycleManagerTests"
John Reck [Thu, 1 Sep 2016 20:04:00 +0000 (13:04 -0700)]
Fix EGLImage memory leak
bug:
31247709
Change-Id: Ifb3087a6e76d0d1304f55d13e468bafbd78418da
Wale Ogunwale [Thu, 1 Sep 2016 20:39:32 +0000 (20:39 +0000)]
Merge "Fixed indexOutOfBoundsException in WindowManager"
Wale Ogunwale [Thu, 1 Sep 2016 20:22:39 +0000 (13:22 -0700)]
Fixed indexOutOfBoundsException in WindowManager
Problem was introduced in ag/
1395371 where we were looking through the
wrong list for the wallpaper. We need to look through the DisplayContent
window list which is windowList and not the WindowToken list which is windows.
Bug:
31234488
Change-Id: If8b3d4c00f268525132a0c452a0225c90c9f02b1
Jeff Sharkey [Thu, 1 Sep 2016 17:07:23 +0000 (11:07 -0600)]
Add optional logging to investigate URI grants.
Developers are seeing odd reports of URI permission grants
disappearing unexpectedly. This optional logging can be enabled to
show exactly where granting/revoking is happening.
Bug:
30978171
Change-Id: I8a5a976f42d4b71270e69c5597dfcb5d89e18848
Sudheer Shanka [Wed, 24 Aug 2016 17:49:33 +0000 (10:49 -0700)]
Fix UserManagerTest#testGetUserCreationTime.
Fixes:
31152306
Test: adb shell am instrument -e class com.android.server.pm.UserManagerTest -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I80de0899390d3dd9d7cd058cd9598665cb1f767b
Geoffrey Pitsch [Wed, 31 Aug 2016 16:44:08 +0000 (12:44 -0400)]
Mock PackageManager for TileLifecycleManagerTests
Slices ~10 seconds off the systemui target test time.
Wrapped calls to the different PackageManager APIs with
PackageManagerAdapter, which should change to a cleaner
abstraction as we write more tests.
Change-Id: I91ac9959de05a06ed484e49648203729159a482e
Sudheer Shanka [Thu, 1 Sep 2016 18:50:13 +0000 (18:50 +0000)]
Merge "Remove wifi related unit tests in SettingsLib"
Bill Yi [Thu, 1 Sep 2016 18:38:43 +0000 (18:38 +0000)]
Import translations. DO NOT MERGE
am:
d341e0f050 -s ours
Change-Id: I961ce03a32ef4cffa63436cd845561f469f0031f
Chih-hung Hsieh [Thu, 1 Sep 2016 18:02:04 +0000 (18:02 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
a6b6252d8b am:
1676161c1d am:
316fa0aee7
am:
650615fb17
Change-Id: I0a37e6bd2c8e971c964dc5a4c4a6e6c228bce705
Chih-hung Hsieh [Thu, 1 Sep 2016 17:56:12 +0000 (17:56 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
a6b6252d8b am:
1676161c1d
am:
316fa0aee7
Change-Id: I43d1cc625834092f12adec5ff52d1565d1b91e23
Chih-hung Hsieh [Thu, 1 Sep 2016 17:49:58 +0000 (17:49 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
a6b6252d8b
am:
1676161c1d
Change-Id: Idf7b8caca19d0062955e3423c1420c7247a900bf
Chih-hung Hsieh [Thu, 1 Sep 2016 17:43:58 +0000 (17:43 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
a6b6252d8b
Change-Id: I1d90581b920f0d932795b029b433664f12b0698d
Chih-hung Hsieh [Thu, 1 Sep 2016 17:33:42 +0000 (17:33 +0000)]
Merge "Fix google-explicit-constructor warnings."
TreeHugger Robot [Thu, 1 Sep 2016 17:18:27 +0000 (17:18 +0000)]
Merge "Update normal dark button colour to match UX specs." into cw-f-dev
Jason Monk [Thu, 1 Sep 2016 16:51:11 +0000 (16:51 +0000)]
Add branded VPN messages to go along with branded icons
am:
802bc6ee06
Change-Id: I5b8c79bd7edfd0704e5305e94fa9b05f62cb940e
Jordan Liu [Thu, 1 Sep 2016 16:20:56 +0000 (16:20 +0000)]
Merge "Remove migrated config_carrier_wfc_ims_available"
Phil Weaver [Thu, 1 Sep 2016 15:57:07 +0000 (15:57 +0000)]
Merge "Add tests for accessibility cache."
Ed Heyl [Thu, 1 Sep 2016 15:28:14 +0000 (08:28 -0700)]
Revert "Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations"
This reverts commit
435f98de830f6d1cbb9740d7489562a70f6d091d.
Jason Monk [Thu, 1 Sep 2016 14:45:08 +0000 (10:45 -0400)]
Add branded VPN messages to go along with branded icons
Change-Id: Id2089d50581a958ebab6af1d5b172ec61b1aced3
Fixes:
31019697
Neil Fuller [Thu, 1 Sep 2016 13:39:48 +0000 (13:39 +0000)]
Merge "Track exposure of new j.l.reflect methods" am:
47784a790b am:
e24533d033 am:
328d9f5fc3
am:
f1e8aed4cd
Change-Id: Ib5a7e2777083bc4a92594bf90ea2de1d1ceb8371
Neil Fuller [Thu, 1 Sep 2016 13:34:14 +0000 (13:34 +0000)]
Merge "Track exposure of new j.l.reflect methods" am:
47784a790b am:
e24533d033
am:
328d9f5fc3
Change-Id: Ic6e8a60a33d92dec19947a9a298e26f01482abf0
Neil Fuller [Thu, 1 Sep 2016 13:28:23 +0000 (13:28 +0000)]
Merge "Track exposure of new j.l.reflect methods" am:
47784a790b
am:
e24533d033
Change-Id: I5d2ddd071a79d62cf878b45113a6f7f3c44071aa
Neil Fuller [Thu, 1 Sep 2016 13:23:45 +0000 (13:23 +0000)]
Merge "Track exposure of new j.l.reflect methods"
am:
47784a790b
Change-Id: Id3a391dbc2808925a298f24af942ac927f523bb5
Neil Fuller [Thu, 1 Sep 2016 13:15:52 +0000 (13:15 +0000)]
Merge "Track exposure of new j.l.reflect methods"
TreeHugger Robot [Thu, 1 Sep 2016 11:04:41 +0000 (11:04 +0000)]
Merge "Move Status to libhidl."
Martijn Coenen [Wed, 31 Aug 2016 23:37:05 +0000 (01:37 +0200)]
Move Status to libhidl.
Bug:
31226252
Change-Id: Ieb0adcf1fa71d6859324c2d83841685d1e1a22f8
Bill Yi [Thu, 1 Sep 2016 07:16:19 +0000 (07:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
ac63c8589c -s ours am:
fb4699d398 -s ours
am:
d64ed5fd27 -s ours
Change-Id: I63dd8beaa188e4286644ded9d33464f8309c7f23
Bill Yi [Thu, 1 Sep 2016 07:13:23 +0000 (07:13 +0000)]
Import translations. DO NOT MERGE am:
fa6279f670 -s ours am:
208e9a6fb3 -s ours
am:
6197efe556 -s ours
Change-Id: I79985a9bec760c59de95fa3a2b22fdd46b397273
Bill Yi [Thu, 1 Sep 2016 07:13:20 +0000 (07:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
77f30cd209 -s ours
am:
a2c31f5dfe -s ours
Change-Id: Ia7c4b49e4fd9fa7f56be4c4aadd45d41b73062da
Bill Yi [Thu, 1 Sep 2016 07:13:17 +0000 (07:13 +0000)]
Import translations. DO NOT MERGE am:
4f0e401700 -s ours
am:
dd0b783c29 -s ours
Change-Id: Iadb64979f5ed4d9eb143cab641878140b8c29ee6
Bill Yi [Thu, 1 Sep 2016 07:13:13 +0000 (07:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
a0e5744ded -s ours
am:
3dfc6cfab1 -s ours
Change-Id: I3f49b2c3308dcdcfe59cbc54d803d236a576e756
Bill Yi [Thu, 1 Sep 2016 07:13:10 +0000 (07:13 +0000)]
Import translations. DO NOT MERGE am:
42ba47e66a -s ours
am:
6e9cc9d16a -s ours
Change-Id: I304aecdf9dc8b89e83f01df931791b2f5bc6c27e
Bill Yi [Thu, 1 Sep 2016 07:07:04 +0000 (07:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d84995e18f -s ours am:
782e55f75c -s ours
am:
bd811838f7 -s ours
Change-Id: Iffcf95ab7e3f336662aa2f7f2399b1917fce56be
Bill Yi [Thu, 1 Sep 2016 07:07:01 +0000 (07:07 +0000)]
Import translations. DO NOT MERGE am:
8961beac16 -s ours am:
fd87141dcf -s ours
am:
049ff38d92 -s ours
Change-Id: I23e4762916bf72a7f3fbd8780c7dd657c0455215
Colin Cross [Thu, 1 Sep 2016 07:06:58 +0000 (07:06 +0000)]
Merge "Fix missing dependency on R.java" am:
227a176508 am:
bfd4422060 am:
0903ecb99b
am:
cdd5f65515
Change-Id: I3868e11d968d9e7c1c265d89c6991d500fc6b968
Andrew Solovay [Thu, 1 Sep 2016 07:04:26 +0000 (07:04 +0000)]
docs: Typo fix in multi-window docs am:
0b423e5eae am:
2570531cf4 am:
34f98f7cd9 am:
59fb2fc908
am:
aa5cf5b915
Change-Id: Ic3381a6f4148e9f47d12c325b24aa0251cc6bf35
Jorim Jaggi [Thu, 1 Sep 2016 07:04:23 +0000 (07:04 +0000)]
Merge "Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations" into nyc-mr1-dev am:
95c1cbeb50 am:
023ea2a3ae
am:
2de5ae58d8
Change-Id: I327842267a1674ac6e67a6ae9d462854879fb542
Jorim Jaggi [Thu, 1 Sep 2016 07:04:20 +0000 (07:04 +0000)]
Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations am:
435f98de83 am:
d8f89315ac
am:
4c0b78af0c
Change-Id: I5af8a379bf3d5c97f3b283a39555ca83807383ee
Andrew Solovay [Thu, 1 Sep 2016 07:04:16 +0000 (07:04 +0000)]
Merge "docs: Fixing formatting problem" into nyc-dev am:
9499478c80 am:
d3f59086a7 am:
59118fc9df am:
f5e3cc3b85
am:
0973a3af81
Change-Id: If060e7d37f280b6b656fdd509871dd9fb3eee8ba
OSDN Git Service
