OSDN Git Service
Aurimas Liutikas [Fri, 17 Jun 2016 23:20:31 +0000 (23:20 +0000)]
Merge \\\\"Fix spelling error in Core App Quality docs.\\\\" into mnc-io-docs am:
3c8b96ad1f am:
cd9cc200d8 am:
f33ce4e846
am:
75b60d5f37
Change-Id: I484d2253a7267f0341428d93d456e26d245cb19d
Aurimas Liutikas [Fri, 17 Jun 2016 23:14:24 +0000 (23:14 +0000)]
Merge \\\"Fix spelling error in Core App Quality docs.\\\" into mnc-io-docs am:
3c8b96ad1f am:
cd9cc200d8
am:
f33ce4e846
Change-Id: Icc8411877a5dc99d65809c9b184ffb159ca0de89
Aurimas Liutikas [Fri, 17 Jun 2016 23:11:23 +0000 (23:11 +0000)]
Merge \\"Fix spelling error in Core App Quality docs.\\" into mnc-io-docs am:
3c8b96ad1f
am:
cd9cc200d8
Change-Id: I590329103ed52b33e01b90964fa2a142c9e6e133
Aurimas Liutikas [Fri, 17 Jun 2016 23:06:08 +0000 (23:06 +0000)]
Merge \"Fix spelling error in Core App Quality docs.\" into mnc-io-docs
am:
3c8b96ad1f
Change-Id: I78b545d5bf018f7c9fd94397365753c8120700fe
Aurimas Liutikas [Fri, 17 Jun 2016 22:57:01 +0000 (22:57 +0000)]
Merge "Fix spelling error in Core App Quality docs." into mnc-io-docs
Sudheer Shanka [Fri, 17 Jun 2016 22:15:56 +0000 (22:15 +0000)]
Merge \\"Add pm operation to set user restrictions.\\" into nyc-dev am:
f6824b51cc
am:
098bc0d840
Change-Id: I30e1aa159407cdd7b55f8fa0ae1e6f54c37a62c8
Sudheer Shanka [Fri, 17 Jun 2016 22:08:07 +0000 (22:08 +0000)]
Merge \"Add pm operation to set user restrictions.\" into nyc-dev
am:
f6824b51cc
Change-Id: I137151742049c0a02d41a02e49abb679234f14b9
Amith Yamasani [Fri, 17 Jun 2016 22:06:39 +0000 (22:06 +0000)]
Merge \\"Clean up ex-users in lock settings db\\" into nyc-dev am:
8cbe1a6309
am:
821f3b7bf7
Change-Id: I4e922238832a6b7fe81ccc6bf05b107595ac836f
Svetoslav Ganov [Fri, 17 Jun 2016 22:06:36 +0000 (22:06 +0000)]
Merge \\"Don\\'t dispatch Uris with appended user handle\\" into nyc-dev am:
7ef9f61be6
am:
82f491ec05
Change-Id: I3a096672ca35073fd8d982942a44e4852649ea71
TreeHugger Robot [Fri, 17 Jun 2016 22:03:58 +0000 (22:03 +0000)]
Merge "Add pm operation to set user restrictions." into nyc-dev
Amith Yamasani [Fri, 17 Jun 2016 22:01:35 +0000 (22:01 +0000)]
Merge \"Clean up ex-users in lock settings db\" into nyc-dev
am:
8cbe1a6309
Change-Id: I97a70eafc6e6657b8d0f87a134c17499d66ccc77
Svet Ganov [Fri, 17 Jun 2016 22:01:32 +0000 (22:01 +0000)]
Merge \"Don\'t dispatch Uris with appended user handle\" into nyc-dev
am:
7ef9f61be6
Change-Id: I1ecce2c6c319fa22a09472f110823798e3ffee9f
Amith Yamasani [Fri, 17 Jun 2016 21:55:59 +0000 (21:55 +0000)]
Merge "Clean up ex-users in lock settings db" into nyc-dev
Svetoslav Ganov [Fri, 17 Jun 2016 21:51:33 +0000 (21:51 +0000)]
Merge "Don't dispatch Uris with appended user handle" into nyc-dev
Winson Chung [Fri, 17 Jun 2016 21:39:00 +0000 (21:39 +0000)]
Merge \\"Ensure that the tint is properly applied in docked mode.\\" into nyc-dev am:
b1f3404f8f
am:
702bf7407c
Change-Id: If2a7eec78b88c07a61c1109f2e3ce11339f86b8f
Winson [Fri, 17 Jun 2016 21:34:21 +0000 (21:34 +0000)]
Merge \"Ensure that the tint is properly applied in docked mode.\" into nyc-dev
am:
b1f3404f8f
Change-Id: I60d795b21f9a5a2b0f2555e959607a8dfefa7e9f
Winson Chung [Fri, 17 Jun 2016 21:29:02 +0000 (21:29 +0000)]
Merge "Ensure that the tint is properly applied in docked mode." into nyc-dev
Dianne Hackborn [Fri, 17 Jun 2016 20:45:42 +0000 (20:45 +0000)]
Merge \\"Work on issue #
29328569: NPE in \\" com.google.android.configupdater\\"\\" into nyc-dev am:
6bc33b07f4
am:
3230838f91
Change-Id: Ieecd701765fcb9646b2dab92e004b556b9799900
Makoto Onuki [Fri, 17 Jun 2016 20:40:16 +0000 (20:40 +0000)]
Merge \"Update manifest shortcut XML schema\" into nyc-mr1-dev
am:
a65d8b6609
Change-Id: I7f7b88bb468e608e28ecb2af3b2455ae75e812af
Dianne Hackborn [Fri, 17 Jun 2016 20:39:32 +0000 (20:39 +0000)]
Merge \"Work on issue #
29328569: NPE in \" com.google.android.configupdater\"\" into nyc-dev
am:
6bc33b07f4
Change-Id: Idff85b167a76c6a1bda3fe7e1b5fd2a5cfc6eccc
Dianne Hackborn [Fri, 17 Jun 2016 20:33:21 +0000 (20:33 +0000)]
Merge "Work on issue #
29328569: NPE in " com.google.android.configupdater"" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 20:31:23 +0000 (20:31 +0000)]
Merge \\"QS Edit: Fix auto-selecting add location\\" into nyc-dev am:
dd65ee628f
am:
e253259000
Change-Id: I9d1f13ebedfd0ff91b0c298d92c83ac8bfa884ae
Makoto Onuki [Fri, 17 Jun 2016 20:29:37 +0000 (20:29 +0000)]
Merge "Update manifest shortcut XML schema" into nyc-mr1-dev
Jason Monk [Fri, 17 Jun 2016 20:28:14 +0000 (20:28 +0000)]
Merge \"QS Edit: Fix auto-selecting add location\" into nyc-dev
am:
dd65ee628f
Change-Id: I33256558f03d993c88520ff50d4bab915ee7ccbd
TreeHugger Robot [Fri, 17 Jun 2016 20:22:45 +0000 (20:22 +0000)]
Merge "QS Edit: Fix auto-selecting add location" into nyc-dev
Fan Zhang [Fri, 17 Jun 2016 20:20:49 +0000 (20:20 +0000)]
Merge \"Add metrics for new tabs in Settings.\" into nyc-mr1-dev
am:
1f7be32325
Change-Id: I86aa5d13ecb733c95d3f2456f5df6a6b62860ca1
John Reck [Fri, 17 Jun 2016 20:20:38 +0000 (20:20 +0000)]
Merge \"Move SurfaceView offscreen if the app stops drawing it\" into nyc-mr1-dev
am:
e66dedf35b
Change-Id: I3d070161a4bdacd0cdcf2e61f026f9fffe15890e
Fan Zhang [Fri, 17 Jun 2016 20:15:46 +0000 (20:15 +0000)]
Merge "Add metrics for new tabs in Settings." into nyc-mr1-dev
John Reck [Fri, 17 Jun 2016 20:13:19 +0000 (20:13 +0000)]
Merge "Move SurfaceView offscreen if the app stops drawing it" into nyc-mr1-dev
Makoto Onuki [Thu, 16 Jun 2016 16:51:40 +0000 (09:51 -0700)]
Update manifest shortcut XML schema
Use the standard <intent> tag instead of custom tags.
- Also fix setDynamicShortcuts(), which was broken in the previous CL.
- Also tolerate runtime exceptions while parsing XMLs
- Also fix b/
29422018 while I'm at it
Bug
29390156
Bug
29077932
Bug
29422018
Change-Id: I2756c9d66c6d7b2962a982d9e57a7d84a5755b28
Jason Monk [Fri, 17 Jun 2016 18:50:05 +0000 (18:50 +0000)]
Merge \\"QS API: Fix mService and mTile being null once and for all\\" into nyc-dev am:
fc70b07385
am:
c552a36992
Change-Id: I7a0cc08bbad4ae7ccfd3344f3235ab88eddefab4
Hemal Patel [Fri, 17 Jun 2016 18:45:38 +0000 (18:45 +0000)]
Merge \\"Merge \\\\"Docs: Completed updates to the Data Binding docs\\\\" into mnc-io-docs am:
eebe22fef6 am:
f693ea687f\\" into nyc-dev am:
68bfdd71b5
am:
4c163e95ba
Change-Id: Ib933cb760a32ab4e9a317c39f0cb931b79b54d1e
Joe Fernandez [Fri, 17 Jun 2016 18:45:36 +0000 (18:45 +0000)]
Merge \\"docs: NDK r12 release notes and downloads\\" into nyc-dev am:
9f0722a4c7
am:
90ae8fb4d3
Change-Id: Ibdbd392b832e2b1c603d6f470371510f1a2f84bd
Jason Monk [Fri, 17 Jun 2016 18:45:04 +0000 (18:45 +0000)]
Merge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
am:
fc70b07385
Change-Id: I2aed24cf36354fbe332787082bcf628357bab3b1
Hemal Patel [Fri, 17 Jun 2016 18:40:46 +0000 (18:40 +0000)]
Merge \"Merge \\\"Docs: Completed updates to the Data Binding docs\\\" into mnc-io-docs am:
eebe22fef6 am:
f693ea687f\" into nyc-dev
am:
68bfdd71b5
Change-Id: Ic5b6de49c28329330477b7881c64eb0614628f4d
Joe Fernandez [Fri, 17 Jun 2016 18:40:37 +0000 (18:40 +0000)]
Merge \"docs: NDK r12 release notes and downloads\" into nyc-dev
am:
9f0722a4c7
Change-Id: If4d04180cb625f319887ea156cdfec25245d6031
TreeHugger Robot [Fri, 17 Jun 2016 18:38:25 +0000 (18:38 +0000)]
Merge "QS API: Fix mService and mTile being null once and for all" into nyc-dev
Android Build Merger (Role) [Fri, 17 Jun 2016 18:35:50 +0000 (18:35 +0000)]
Merge "Merge \\"Docs: Completed updates to the Data Binding docs\\" into mnc-io-docs am:
eebe22fef6 am:
f693ea687f" into nyc-dev
Hemal Patel [Fri, 17 Jun 2016 18:35:24 +0000 (18:35 +0000)]
Merge \\"Docs: Completed updates to the Data Binding docs\\" into mnc-io-docs am:
eebe22fef6
am:
f693ea687f
Change-Id: I235e73606098e54fc14568c6437af314f9bea337
Joe Fernandez [Fri, 17 Jun 2016 18:35:07 +0000 (18:35 +0000)]
Merge "docs: NDK r12 release notes and downloads" into nyc-dev
Chong Zhang [Fri, 17 Jun 2016 18:32:31 +0000 (18:32 +0000)]
Merge \\"Do a forceLayout if pending insets is changed after relayout window\\" into nyc-dev am:
2756d0707f
am:
dba235d91a
Change-Id: I1a9758b62322aecaea79c879f82b1793bae67061
Yigit Boyar [Fri, 17 Jun 2016 18:31:17 +0000 (18:31 +0000)]
Merge \"Docs: Completed updates to the Data Binding docs\" into mnc-io-docs
am:
eebe22fef6
Change-Id: I47b4003b1bd1bb5cdfc12bde543dd2c9d8babdcc
Chong Zhang [Fri, 17 Jun 2016 18:26:45 +0000 (18:26 +0000)]
Merge \"Do a forceLayout if pending insets is changed after relayout window\" into nyc-dev
am:
2756d0707f
Change-Id: Ia95dd424c118b962a9a10ac074d508758b49ea90
Hemal Patel [Fri, 17 Jun 2016 18:25:47 +0000 (18:25 +0000)]
Merge "Docs: Completed updates to the Data Binding docs" into mnc-io-docs
Chong Zhang [Fri, 17 Jun 2016 18:22:29 +0000 (18:22 +0000)]
Merge "Do a forceLayout if pending insets is changed after relayout window" into nyc-dev
Joe Fernandez [Thu, 16 Jun 2016 20:31:28 +0000 (13:31 -0700)]
docs: NDK r12 release notes and downloads
b/
29188616
Change-Id: Ida2b9b0e308799f9001127006e3be84318857aaa
Mady Mellor [Fri, 17 Jun 2016 17:39:30 +0000 (17:39 +0000)]
Merge \\"Fix shade background not aligning with bottom of a group\\" into nyc-dev am:
4f9404f6f2
am:
8b1ddeb89a
Change-Id: I190ae94014df9d17ca98174e55f64afe54850a42
Jason Monk [Fri, 17 Jun 2016 17:39:28 +0000 (17:39 +0000)]
Merge \\"Bring out your toggles\\" into nyc-dev am:
3aee783837
am:
9f2a00a3b4
Change-Id: Icdba6673f3708864832637c4a4e48c7413ceb934
Sanket Padawe [Fri, 17 Jun 2016 17:29:43 +0000 (17:29 +0000)]
Merge \"Modify TelephonyHistogram.java functions.\" into nyc-mr1-dev
am:
ffaec89277
Change-Id: I1a5343468822da6531cb769f0526262e5fb34889
Mady Mellor [Fri, 17 Jun 2016 17:26:54 +0000 (17:26 +0000)]
Merge \"Fix shade background not aligning with bottom of a group\" into nyc-dev
am:
4f9404f6f2
Change-Id: I50aab94c497af12a3f2d3522425ddd850c2e3793
Jason Monk [Fri, 17 Jun 2016 17:26:50 +0000 (17:26 +0000)]
Merge \"Bring out your toggles\" into nyc-dev
am:
3aee783837
Change-Id: I50ac9d6382b10335464fb3608afbf0aeb9c1dc7b
Sanket Padawe [Fri, 17 Jun 2016 17:24:12 +0000 (17:24 +0000)]
Merge "Modify TelephonyHistogram.java functions." into nyc-mr1-dev
John Reck [Thu, 16 Jun 2016 22:36:13 +0000 (15:36 -0700)]
Move SurfaceView offscreen if the app stops drawing it
Bug:
29360411
Change-Id: Iefb9d7a9dafb34a2b4f79130a2a8b5a7cf7de906
Mady Mellor [Fri, 17 Jun 2016 17:22:34 +0000 (17:22 +0000)]
Merge "Fix shade background not aligning with bottom of a group" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 17:22:01 +0000 (17:22 +0000)]
Merge "Bring out your toggles" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 17:15:34 +0000 (13:15 -0400)]
QS Edit: Fix auto-selecting add location
We depend on a layout listener for when we ask for focus, but layout
sometimes doesn't happen. Make it always happen.
Change-Id: I7c805470c6ce9863bf7eac627f59d49191ce8946
Fixes:
29126464
Tony Mak [Fri, 17 Jun 2016 17:14:34 +0000 (17:14 +0000)]
Merge \\"Allow stopping user to access AppWidgetService API\\" into nyc-dev am:
ab8d4cf645
am:
95d0d631ba
Change-Id: I96a69067705cced7afa15b900e91d88a14216cda
Christopher Tate [Fri, 17 Jun 2016 17:14:31 +0000 (17:14 +0000)]
DO NOT MERGE: Don\\\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a am:
34fb87b519 am:
1a450675f3 am:
790c87a05b -s ours am:
02435d2419
am:
9caec9ff63
Change-Id: I0627b60a6bfad0bce65532df79b2b75b5683a0ab
Christopher Tate [Fri, 17 Jun 2016 17:14:28 +0000 (17:14 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab am:
e2c9b1af3e am:
d2a4e1b39c am:
1c3be1a5b1
am:
4f7b337cdd
Change-Id: I0eb32f4d57272a3c77c3d5e00881af8665f41645
Adrian Roos [Fri, 17 Jun 2016 17:14:24 +0000 (17:14 +0000)]
Merge \\"Remove RemoteInput on lockscreen setting\\" into nyc-dev am:
a66746d167
am:
85785eb9e7
Change-Id: I4843e87dac6a9c94692361a70f15c2d1cc621308
Tony Mak [Fri, 17 Jun 2016 17:09:22 +0000 (17:09 +0000)]
Merge \"Allow stopping user to access AppWidgetService API\" into nyc-dev
am:
ab8d4cf645
Change-Id: I2280fae9d85594ad0fde5d552ff07b0d4e0c6158
Christopher Tate [Fri, 17 Jun 2016 17:09:16 +0000 (17:09 +0000)]
DO NOT MERGE: Don\\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a am:
34fb87b519 am:
1a450675f3 am:
790c87a05b -s ours
am:
02435d2419
Change-Id: I97b8993491e9a7441177f9d521f9971cf2c155a5
Christopher Tate [Fri, 17 Jun 2016 17:09:13 +0000 (17:09 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab am:
e2c9b1af3e am:
d2a4e1b39c
am:
1c3be1a5b1
Change-Id: If72735aeb86874e3d672a9567f03fecdb9ed00eb
Adrian Roos [Fri, 17 Jun 2016 17:09:01 +0000 (17:09 +0000)]
Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
am:
a66746d167
Change-Id: If3724770b370b83c3de9e30a0c917d4ad1bc72d5
Jason Monk [Fri, 17 Jun 2016 16:42:59 +0000 (12:42 -0400)]
QS API: Fix mService and mTile being null once and for all
Change-Id: Idd82e4c2f6cfc2b30432e15e23963c1d7a959e43
Fixes:
29121793
Aurimas Liutikas [Thu, 16 Jun 2016 19:15:56 +0000 (12:15 -0700)]
Fix spelling error in Core App Quality docs.
Bug:
https://code.google.com/p/android/issues/detail?id=213248
Change-Id: Idf83eb4fdc09bc3c78a7786b4bf11707178092c7
(cherry picked from commit
08b10586120f3db6e29e5ece9c3e05462f0c01e9)
Fyodor Kupolov [Fri, 17 Jun 2016 16:13:09 +0000 (16:13 +0000)]
Merge \\"Do not schedule restarts if the system is shutting down\\" into nyc-dev am:
1f0151220e
am:
825e477fbe
Change-Id: Icb2528c9eb25a5fd02debdd7be4b4f3ab01e168b
Fyodor Kupolov [Fri, 17 Jun 2016 16:09:08 +0000 (16:09 +0000)]
Merge \"Do not schedule restarts if the system is shutting down\" into nyc-dev
am:
1f0151220e
Change-Id: Ifca7385204731e6b764fbeda59570f1789ecc0e0
Fyodor Kupolov [Fri, 17 Jun 2016 16:09:05 +0000 (16:09 +0000)]
Merge \\"Call AppOpsService from the handler thread\\" into nyc-dev am:
1347cdb2e1
am:
b43646c119
Change-Id: I300fd7b7184bc7e6d3a40797d741914af6b61300
Fyodor Kupolov [Fri, 17 Jun 2016 16:03:54 +0000 (16:03 +0000)]
Merge \"Call AppOpsService from the handler thread\" into nyc-dev
am:
1347cdb2e1
Change-Id: If17588d0b12412c88e21d8a2ee3ee9bfc4778589
Fyodor Kupolov [Fri, 17 Jun 2016 16:01:09 +0000 (16:01 +0000)]
Merge "Do not schedule restarts if the system is shutting down" into nyc-dev
Fyodor Kupolov [Fri, 17 Jun 2016 15:59:06 +0000 (15:59 +0000)]
Merge "Call AppOpsService from the handler thread" into nyc-dev
Alan Viverette [Fri, 17 Jun 2016 14:29:04 +0000 (10:29 -0400)]
resolve merge conflicts of
0073a03 to nyc-mr1-dev-plus-aosp
Change-Id: I89383ebf0633996f1f706b6c14a9b34cb47aadc2
Jason Monk [Fri, 17 Jun 2016 14:19:43 +0000 (10:19 -0400)]
Bring out your toggles
Switch Wifi and BT back to toggling from QQS. Make cell open a
detail panel.
Change-Id: Ibdd8fa52a31c4bf81ee0e6974e263b46b6f71a31
Fixes:
29406644
Alan Viverette [Fri, 17 Jun 2016 14:05:14 +0000 (14:05 +0000)]
Merge \"Notify user when application does not support current display zoom\" into nyc-dev
am:
c577a50d09
Change-Id: Ibab788d39a4b93ef57aaffd81debd0447ffa8f9a
Alan Viverette [Fri, 17 Jun 2016 13:59:12 +0000 (13:59 +0000)]
Merge "Notify user when application does not support current display zoom" into nyc-dev
Tony Mak [Fri, 17 Jun 2016 13:36:30 +0000 (13:36 +0000)]
Merge \\"Allow stopping user to access AppWidgetService API\\" into nyc-dev am:
ab8d4cf645
am:
44864e5c12
Change-Id: I718e396108f3e5518d8e121edb7c47d2af6e6b29
Tony Mak [Fri, 17 Jun 2016 13:31:43 +0000 (13:31 +0000)]
Merge \"Allow stopping user to access AppWidgetService API\" into nyc-dev
am:
ab8d4cf645
Change-Id: If1ed361c6f8c7008271cf1da4317c9ac47a5af73
Tony Mak [Fri, 17 Jun 2016 13:25:05 +0000 (13:25 +0000)]
Merge "Allow stopping user to access AppWidgetService API" into nyc-dev
Bill Yi [Fri, 17 Jun 2016 06:54:49 +0000 (06:54 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
12af7eb3ab -s ours
am:
2fc6dfb440 -s ours
Change-Id: Ie5fb82ab8b8827153b4bf7cfe372106d4da56f63
Bill Yi [Fri, 17 Jun 2016 06:54:48 +0000 (06:54 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
3aca33df86 -s ours
am:
3b937e62a2 -s ours
Change-Id: I7b4c98808937fceb88e3cbc8d8b52cbb2a97502f
Bill Yi [Fri, 17 Jun 2016 06:54:46 +0000 (06:54 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
90730d5542 -s ours
am:
c7421fc5e2 -s ours
Change-Id: I2594b068adfbb1606fad78581b50ea3263d18916
Bill Yi [Fri, 17 Jun 2016 06:54:44 +0000 (06:54 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
d063b809ec -s ours
am:
e55eb56a85 -s ours
Change-Id: I3dade94e2d10c412a52a5b92533359a749c676fd
Bill Yi [Fri, 17 Jun 2016 06:52:35 +0000 (06:52 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
036c415394 -s ours
am:
9b4f8d1a92 -s ours
Change-Id: I3272a8435b0b6da0f3bfa58559d6e1b0e7dbfb14
Bill Yi [Fri, 17 Jun 2016 06:52:33 +0000 (06:52 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
11b2b26911 -s ours
am:
560ad74240 -s ours
Change-Id: I4ca2a4b5cb10013f02999eb67c3fd6b87c5dec74
Bill Yi [Fri, 17 Jun 2016 06:52:31 +0000 (06:52 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
0555bb3003 -s ours
am:
6abeadf69d -s ours
Change-Id: If0aa1679eb6a09080575ba4eb4b39833e04a8e5f
Bill Yi [Fri, 17 Jun 2016 06:52:29 +0000 (06:52 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
c52cdca3a6 -s ours
am:
0e2f17da9f -s ours
Change-Id: Iae86f621db804cb162cb2fe61b8b8e8561a63a80
Bill Yi [Fri, 17 Jun 2016 06:52:28 +0000 (06:52 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
f81b519438 -s ours
am:
00dac967a7 -s ours
Change-Id: Ibc1d67ac2f92b28b8ba0f78bf63b78121e1e28fd
Bill Yi [Fri, 17 Jun 2016 06:50:33 +0000 (06:50 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
c4a5178d66 -s ours
am:
1d64b70109 -s ours
Change-Id: I003cf77397bf266091ef9cb55acedab5ccab39d0
Bill Yi [Fri, 17 Jun 2016 06:50:32 +0000 (06:50 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
b141b6399f -s ours
am:
0f1467c5f1 -s ours
Change-Id: I58d3c4ea3980dc56428650ee8f06d558fe863a4c
Christopher Tate [Fri, 17 Jun 2016 06:50:30 +0000 (06:50 +0000)]
DO NOT MERGE: Don\\\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a am:
34fb87b519 am:
1a450675f3 am:
790c87a05b -s ours am:
02435d2419
am:
313dec8155
Change-Id: Iaa07eb947fad2fe822964d12275a591ce31fffc4
Christopher Tate [Fri, 17 Jun 2016 06:50:28 +0000 (06:50 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab am:
e2c9b1af3e am:
d2a4e1b39c am:
1c3be1a5b1
am:
6b24c84fa2
Change-Id: I76d2691cdbdc5577b12e2f5b6a58f0478eb48dff
Adrian Roos [Fri, 17 Jun 2016 06:50:22 +0000 (06:50 +0000)]
Merge \\"Remove RemoteInput on lockscreen setting\\" into nyc-dev am:
a66746d167
am:
0f93a4ebe9
Change-Id: I0bafce17d126c057bc1f62f78a3efa00feb84960
Bill Yi [Fri, 17 Jun 2016 05:16:42 +0000 (05:16 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
12af7eb3ab -s ours
Change-Id: I25c71a14da3d1fa62d7916f2cc54fb987d87d2f6
Bill Yi [Fri, 17 Jun 2016 05:09:37 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 05:03:23 +0000 (05:03 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
3aca33df86 -s ours
Change-Id: I021c66cdef761d5eac267b21f5e3c28ec9e8a883
Bill Yi [Fri, 17 Jun 2016 04:56:29 +0000 (04:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
90730d5542 -s ours
Change-Id: I5d6d7f5e5c620226242060dfbb14f0464aacc98f
Bill Yi [Fri, 17 Jun 2016 04:56:27 +0000 (04:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
d063b809ec -s ours
Change-Id: I72d0c6acc64adc5852e95f804ef7b7f4730b6e8f
Bill Yi [Fri, 17 Jun 2016 04:53:13 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:50:56 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
OSDN Git Service
