OSDN Git Service
Tony Mak [Fri, 17 Jun 2016 21:27:00 +0000 (21:27 +0000)]
Merge \\\"Allow stopping user to access AppWidgetService API\\\" into nyc-dev am:
ab8d4cf645 am:
44864e5c12
am:
c460856d7b
Change-Id: I0e18e7168a1b07ca9a0a07b121790eba64a354d3
Bill Yi [Fri, 17 Jun 2016 21:26:57 +0000 (21:26 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
12af7eb3ab -s ours am:
2fc6dfb440 -s ours
am:
a03869b296 -s ours
Change-Id: I98ab1b5e5cea8124c59a99007610b6c8ec809762
Bill Yi [Fri, 17 Jun 2016 21:26:54 +0000 (21:26 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
3aca33df86 -s ours am:
3b937e62a2 -s ours
am:
ee05119cc5 -s ours
Change-Id: Ideb4db7adbb1040fd4ba46680a002bdbed40128d
Bill Yi [Fri, 17 Jun 2016 21:26:52 +0000 (21:26 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
90730d5542 -s ours am:
c7421fc5e2 -s ours
am:
37d27a9b7b -s ours
Change-Id: I512b4fc866bd07e6e774ff0d4e907db0e0394835
Bill Yi [Fri, 17 Jun 2016 21:26:49 +0000 (21:26 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
d063b809ec -s ours am:
e55eb56a85 -s ours
am:
7bd5593e04 -s ours
Change-Id: Ib5d65702cd8091bd0316d099da40acd6f1269348
Bill Yi [Fri, 17 Jun 2016 21:17:41 +0000 (21:17 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
036c415394 -s ours am:
9b4f8d1a92 -s ours
am:
35aea9292b -s ours
Change-Id: I43e09be2ca147dd7613fbbae9e79e35e21a6bd77
Bill Yi [Fri, 17 Jun 2016 21:17:33 +0000 (21:17 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
11b2b26911 -s ours am:
560ad74240 -s ours
am:
a40ae4f0d3 -s ours
Change-Id: Ic3b05cd0eff262d7b7502205222936a1ce9b0d5e
Bill Yi [Fri, 17 Jun 2016 21:17:26 +0000 (21:17 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
0555bb3003 -s ours am:
6abeadf69d -s ours
am:
346dd4881d -s ours
Change-Id: I3f0ec3d802dbc153f2b9dac7e56e149eade968b4
Bill Yi [Fri, 17 Jun 2016 21:17:20 +0000 (21:17 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
c52cdca3a6 -s ours am:
0e2f17da9f -s ours
am:
7aa9772393 -s ours
Change-Id: I829efc7928cce21b88fcee66090a4f41cb7b161f
Bill Yi [Fri, 17 Jun 2016 21:17:15 +0000 (21:17 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
f81b519438 -s ours am:
00dac967a7 -s ours
am:
76a4e4c606 -s ours
Change-Id: I9e037e088758cb27adc450d0c1b5de57bc45043e
Bill Yi [Fri, 17 Jun 2016 21:10:57 +0000 (21:10 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
c4a5178d66 -s ours am:
1d64b70109 -s ours
am:
c4af25b743 -s ours
Change-Id: If444bfcd4e85965c3b594e555930aa3a4fb4ae96
Bill Yi [Fri, 17 Jun 2016 21:10:55 +0000 (21:10 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
b141b6399f -s ours am:
0f1467c5f1 -s ours
am:
22411c6e53 -s ours
Change-Id: Ie2c025ddecd6e1e02dc7c358853c6c882be296db
Christopher Tate [Fri, 17 Jun 2016 21:10:53 +0000 (21:10 +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
am:
01a7aa1e7b -s ours
Change-Id: I4a522be72fe9cdcd0ee53863c9d2bea558fd6ffb
Christopher Tate [Fri, 17 Jun 2016 21:10:51 +0000 (21:10 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab am:
e2c9b1af3e am:
d2a4e1b39c am:
1c3be1a5b1 am:
6b24c84fa2
am:
6bf184819c
Change-Id: I542d7994dcf165295bc11ad3678cd9b7038d003b
Adrian Roos [Fri, 17 Jun 2016 21:10:49 +0000 (21:10 +0000)]
Merge \\\"Remove RemoteInput on lockscreen setting\\\" into nyc-dev am:
a66746d167 am:
0f93a4ebe9
am:
c2188c199d
Change-Id: Iede9db36175d02d3af81eccb9e652c2cd7b039fd
Doris Liu [Fri, 17 Jun 2016 21:04:23 +0000 (21:04 +0000)]
Merge \\"Support AVD animation falling back on UI thread\\" into nyc-mr1-dev am:
4e5ee65307
am:
2df9343a77
Change-Id: I4ca02328c52c8802dc5c006ab4bec6b1ec04cd87
ugo_yu [Fri, 17 Jun 2016 21:04:18 +0000 (21:04 +0000)]
Merge \\"Correct typo in BluetoothSap binder\\" into nyc-mr1-dev am:
0db08ca3e7
am:
2380af193e
Change-Id: I2e99a9b8a408abe4eba6c66f5354b0411b69f2cf
Andrew Solovay [Fri, 17 Jun 2016 21:04:12 +0000 (21:04 +0000)]
Merge \"Merge \\\"docs: DP4 release notes: add Android Auto known issue\\\" into nyc-dev am:
bc7b3b5e52 am:
eeabbd353e\" into nyc-mr1-dev-plus-aosp
am:
2d6bbe3780
Change-Id: I2e4c587bbddce04a113d3621bc247a8b5323d2a5
Andrew Solovay [Fri, 17 Jun 2016 21:04:09 +0000 (21:04 +0000)]
Merge \\\"docs: DP4 release notes: add Android Auto known issue\\\" into nyc-dev am:
bc7b3b5e52 am:
76fe4fd14b
am:
5859a811ca
Change-Id: Ib4d5df61daa75a1f7191835c1c4093a1663bfecf
Sudheer Shanka [Fri, 17 Jun 2016 21:04:05 +0000 (21:04 +0000)]
Merge \"Merge \\\"Allow apps with CREATE_USERS permission to create restricted users.\\\" into nyc-dev am:
48ee87d4a7 am:
e1eb4cd0e7\" into nyc-mr1-dev-plus-aosp
am:
ff24b6055d
Change-Id: Id9b5de8d603cbd44b65294562a3d2797217d6cee
Sudheer Shanka [Fri, 17 Jun 2016 21:01:20 +0000 (21:01 +0000)]
Merge \\\"Allow apps with CREATE_USERS permission to create restricted users.\\\" into nyc-dev am:
48ee87d4a7 am:
be8c83a6b9
am:
40636c8a2f
Change-Id: If9f8ef35e369a5a96ebed421bfb6119aac5125cd
Ta-wei Yen [Fri, 17 Jun 2016 21:01:11 +0000 (21:01 +0000)]
Merge \\"Allow the phone process to hide outbound text SMS\\" into nyc-mr1-dev am:
3f258857b5
am:
e5ffc4ac23
Change-Id: I65218336aa17420db78c4d03ae0aa054c96546cf
Bill Yi [Fri, 17 Jun 2016 21:01:03 +0000 (21:01 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
ecfe1a5e17 -s ours am:
7085bb345d -s ours
am:
8f0d2c8e0b -s ours
Change-Id: Ia889bdcc7a972027878d064ce25fcfc0daa0e112
Andrew Sapperstein [Fri, 17 Jun 2016 21:00:49 +0000 (21:00 +0000)]
Merge \\"Refactor DeviceDefault themes.\\" into nyc-mr1-dev am:
2f75cf4bb5
am:
91a540b2de
Change-Id: I7dbe63a9e71bb9ad6f58ef273965368057c17af0
John Reck [Fri, 17 Jun 2016 21:00:30 +0000 (21:00 +0000)]
Merge \\\\"Performance Optimization: Align texture dirty rect\\\\" am:
4e6a73c16a am:
ec45adde70 am:
89132e094f
am:
8ef6b2e628
Change-Id: I46613fa164ab541a313abeadd2b2c4a3b48aad50
Wale Ogunwale [Fri, 17 Jun 2016 20:43:51 +0000 (20:43 +0000)]
Merge \"Merge \\\"Don\\\'t re-launch activities while the device is sleeping\\\" into nyc-dev am:
f6e3c9a553 am:
55ce4a5f19\" into nyc-mr1-dev-plus-aosp
am:
ca0b8d9096
Change-Id: Ibe4fa705e04fd63b1225e8fc27ef4ab0cb34f15d
Wale Ogunwale [Fri, 17 Jun 2016 20:43:44 +0000 (20:43 +0000)]
Merge \"Merge \\\"Don\\\'t re-launch activities while the device is sleeping\\\" into nyc-dev am:
f6e3c9a553 am:
4e9c615769\" into nyc-mr1-dev-plus-aosp
am:
ac769204af
Change-Id: I8b8b26c094b81a89257a7d31ac122c27b6238efc
Andrii Kulian [Fri, 17 Jun 2016 20:43:37 +0000 (20:43 +0000)]
Merge \"Merge \\\"Bring task to front when we can\\\'t move to adjacent stack\\\" into nyc-dev am:
320c15e1b2 am:
ddfeb4a6c2\" into nyc-mr1-dev-plus-aosp
am:
48b7342e1a
Change-Id: I9818dc145c1574207953336a20859ef482f1dc1e
Andrii Kulian [Fri, 17 Jun 2016 20:43:32 +0000 (20:43 +0000)]
Merge \\\"Bring task to front when we can\\\'t move to adjacent stack\\\" into nyc-dev am:
320c15e1b2 am:
8b7544fad7
am:
aef6cc7cc6
Change-Id: Ife079dba557e7cac06f8eb6c0b8214d92162417d
Yorke Lee [Fri, 17 Jun 2016 20:43:15 +0000 (20:43 +0000)]
Merge \"Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev am:
f33af2285b am:
599cf6bc4a\" into nyc-mr1-dev-plus-aosp
am:
fc6c1a8a8e
Change-Id: I0bce88dd079bc5b296fea12b2f5928e815eeb7d8
Yorke Lee [Fri, 17 Jun 2016 20:42:14 +0000 (20:42 +0000)]
Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev am:
f33af2285b am:
3d80871032
am:
11e3bf5d30
Change-Id: I6a99d04fd3f9fb229f532838350313169cec502a
Gina Dimino [Fri, 17 Jun 2016 20:42:12 +0000 (20:42 +0000)]
Merge \"Merge \\\"Docs: Suppress errors in SystemApi Build Bug:
28427390\\\" into nyc-dev am:
d06520a488 am:
0bae4dcd76\" into nyc-mr1-dev-plus-aosp
am:
ada74feacc
Change-Id: I9cdbd5cc246db9fee724b188223b3131e5548df7
Gina Dimino [Fri, 17 Jun 2016 20:42:09 +0000 (20:42 +0000)]
Merge \\\"Docs: Suppress errors in SystemApi Build Bug:
28427390\\\" into nyc-dev am:
d06520a488 am:
b7181150c4
am:
cb08f6805a
Change-Id: I65d3016319d0cc53a53f931aa62c642ac53b9520
Yi Kong [Fri, 17 Jun 2016 20:42:06 +0000 (20:42 +0000)]
Merge \\\"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\\\" into stage-aosp-master am:
e1cf90c6eb am:
e8f9aa9d5d
am:
c3c9fd12b4
Change-Id: I9246184c64dcfc41e4ab5070c74822746e22dc32
Przemyslaw Szczepaniak [Fri, 17 Jun 2016 20:42:04 +0000 (20:42 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c am:
9f4ad4fbb6 am:
dd094522bd
am:
0de979e93d
Change-Id: I664cbb78538a0c7816e710287da9f80fe23fe465
Andrew Solovay [Fri, 17 Jun 2016 20:39:32 +0000 (20:39 +0000)]
Merge \"Merge \\\"docs: Minor update to DP4 release notes\\\" into nyc-dev am:
5a3a66a253 am:
e73adf38a7\" into nyc-mr1-dev-plus-aosp
am:
95f4b1127c
Change-Id: I4f94adb27be1c04e89fee71500ab8f61b69f9bf1
Andrew Solovay [Fri, 17 Jun 2016 20:39:29 +0000 (20:39 +0000)]
Merge \\\"docs: Minor update to DP4 release notes\\\" into nyc-dev am:
5a3a66a253 am:
0d21553bd2
am:
f34c820174
Change-Id: Ib4a25b144e8d4599b70655481a08b4652742eef9
Yujie Qin [Fri, 17 Jun 2016 20:39:26 +0000 (20:39 +0000)]
Merge \"Merge \\\"Report error correctly for the implementation of StreamInterface::GetData()\\\" into nyc-dev am:
e09415344d am:
86c1dd5256\" into nyc-mr1-dev-plus-aosp
am:
032e0a6e5c
Change-Id: Icf9f6561ad7e4bcb45e7f2d4287803220770fe9f
Adrian Roos [Fri, 17 Jun 2016 20:39:23 +0000 (20:39 +0000)]
Merge \"Merge \\\"Fix unresponsive brightness slider after font size change\\\" into nyc-dev am:
db81dd9d2e am:
6ed10f4ffa\" into nyc-mr1-dev-plus-aosp
am:
a360260ef8
Change-Id: I331a4f9cd4c0b4837ae270f363798eb272202b26
Yujie Qin [Fri, 17 Jun 2016 20:39:20 +0000 (20:39 +0000)]
Merge \\\"Report error correctly for the implementation of StreamInterface::GetData()\\\" into nyc-dev am:
e09415344d am:
d09b020ce5
am:
7d10f45325
Change-Id: I9e7bb583346aea5bd06ba84522d52f3e8c47b079
TreeHugger Robot [Fri, 17 Jun 2016 20:32:43 +0000 (20:32 +0000)]
Merge "resolve merge conflicts of
6800033 to master"
TreeHugger Robot [Fri, 17 Jun 2016 19:01:51 +0000 (19:01 +0000)]
Merge "Implementing breadcrumb for tablet devices for navigation in the bar."
Adrian Roos [Fri, 17 Jun 2016 18:57:56 +0000 (11:57 -0700)]
resolve merge conflicts of
6800033 to master
Change-Id: Ica5523a28f15f1c3e86a80b60a119e69705cd1c9
Steve McKay [Fri, 17 Jun 2016 18:33:53 +0000 (18:33 +0000)]
Merge \"Merge \\\"Include cause when reporting errors.\\\" into nyc-dev am:
60585e6c54 am:
ba7fc3b35f\" into nyc-mr1-dev-plus-aosp
am:
5338c243c9
Change-Id: I53e32bd640eb60f407238aa6f37865515066df73
Steve McKay [Fri, 17 Jun 2016 18:33:50 +0000 (18:33 +0000)]
Merge \\\"Include cause when reporting errors.\\\" into nyc-dev am:
60585e6c54 am:
be8b6e6164
am:
7dfb6fa15e
Change-Id: Iade90d4bfb323bcc1bb7a771fcb2b64656c25d57
Felipe Leme [Fri, 17 Jun 2016 18:33:48 +0000 (18:33 +0000)]
Merge \"Merge \\\"Check extra type before blindingly casting to Parcelable.\\\" into nyc-dev am:
47c3afa10b am:
f2326e947c\" into nyc-mr1-dev-plus-aosp
am:
6548d3ad83
Change-Id: I88c6d7a40488c18e6462325ee4cf1fafc4d57851
Felipe Leme [Fri, 17 Jun 2016 18:27:04 +0000 (18:27 +0000)]
Merge \\\"Check extra type before blindingly casting to Parcelable.\\\" into nyc-dev am:
47c3afa10b am:
9b36b6d3d8
am:
b1c898ed65
Change-Id: I8b53612e8716233b444a28882028cfb94cb56e0a
Dianne Hackborn [Fri, 17 Jun 2016 18:27:00 +0000 (18:27 +0000)]
Merge \\"Merge \\\"Fix issue #
29371078: Foreground jobs should not count...\\\" into nyc-dev am:
47cfac6803\\" into nyc-mr1-dev am:
ab84ab5f35
am:
7aa2137c31
Change-Id: Iac9fde0171a021a19398d0f83d91aa00a5050fdf
Michael Kwan [Fri, 17 Jun 2016 18:26:57 +0000 (18:26 +0000)]
Merge \\"Add better configurability for dialog theme colours.\\" into nyc-mr1-dev am:
c637d4bde2
am:
2a68269a44
Change-Id: I0e30dfd1b9c970843e119b8058cea9553e7cb423
Dianne Hackborn [Fri, 17 Jun 2016 18:26:54 +0000 (18:26 +0000)]
Merge \\\"Fix issue #
29371078: Foreground jobs should not count...\\\" into nyc-dev am:
47cfac6803 am:
403e103eb2
am:
e022330079
Change-Id: Iadc898f174ffce99e622d272e1699017acb292f8
Gustav Sennton [Fri, 17 Jun 2016 18:26:50 +0000 (18:26 +0000)]
Merge \"Merge \\\"Support using uninstalled WebView packages as WebView implementation.\\\" into nyc-dev am:
e25c8532b6 am:
4a352d2c41\" into nyc-mr1-dev-plus-aosp
am:
1cfb92097c
Change-Id: I5c8fee73cb32b27b9f6514c129285cca39d0755d
Ben Lin [Fri, 10 Jun 2016 19:13:27 +0000 (12:13 -0700)]
Implementing breadcrumb for tablet devices for navigation in the bar.
Bug:
29214736
Change-Id: I37de2c39a55c33d7111496e896a0c85e1c7fa553
(cherry picked from commit
6fb1dfcc47b795b7071550a4524667d2f8f4d9a2)
Aurimas Liutikas [Fri, 17 Jun 2016 16:26:55 +0000 (16:26 +0000)]
Merge "Fix spelling error in Core App Quality docs."
Mikhail Naganov [Fri, 17 Jun 2016 15:32:00 +0000 (15:32 +0000)]
Merge "UsbMidiDevice: Clean up terminology and fix comments"
Mikhail Naganov [Fri, 17 Jun 2016 11:11:25 +0000 (04:11 -0700)]
UsbMidiDevice: Clean up terminology and fix comments
When working with physical MIDI devices, an *input* stream is used
for reading from *output* port of the device, and vice versa. Thus,
using "input" and "output" without specifying whether it's a stream
or a port is confusing.
Clarify names of counter variables, and fix a couple of comments
that were incorrect due to this confusion. No functional changes.
Change-Id: If561eaca4bade94e9296d2c703c9fcebc91296e2
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
Gustav Sennton [Fri, 17 Jun 2016 10:49:53 +0000 (10:49 +0000)]
Merge "resolve merge conflicts of
6cbf137 to master"
Gustav Sennton [Thu, 16 Jun 2016 19:24:23 +0000 (20:24 +0100)]
resolve merge conflicts of
6cbf137 to master
Change-Id: Idc548a46e96464c11193cf8480d9fb4e07aa438f
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
Bill Yi [Fri, 17 Jun 2016 04:50:40 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:47:08 +0000 (04:47 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
036c415394 -s ours
Change-Id: I5e2c9b89ed067793303ab901de2ac95401ea37a3
Bill Yi [Fri, 17 Jun 2016 04:42:18 +0000 (04:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:28:28 +0000 (04:28 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
11b2b26911 -s ours
Change-Id: If8ae0b33ababcad202f1413032772182acb73de3
Bill Yi [Fri, 17 Jun 2016 04:28:26 +0000 (04:28 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
0555bb3003 -s ours
Change-Id: I07fc3a494ca2ab9e5585febd187c08073483c297
Bill Yi [Fri, 17 Jun 2016 04:23:13 +0000 (04:23 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
c52cdca3a6 -s ours
Change-Id: I28de93fe3f11438c86a95d8ec265f5f690e6f617
Bill Yi [Fri, 17 Jun 2016 04:23:11 +0000 (04:23 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
f81b519438 -s ours
Change-Id: I92d23239291c708c36e0096719ed0420fa360ef2
Bill Yi [Fri, 17 Jun 2016 04:22:50 +0000 (04:22 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:22:08 +0000 (04:22 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:18:05 +0000 (04:18 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
c4a5178d66 -s ours
Change-Id: I2399e19b8b0e9080531f47ca66d552e909b6533b
Bill Yi [Fri, 17 Jun 2016 04:18:04 +0000 (04:18 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
b141b6399f -s ours
Change-Id: Ic9c2413d05260cdebcf38d729e129a5fa19a0bff
Bill Yi [Fri, 17 Jun 2016 04:16:11 +0000 (04:16 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:15:51 +0000 (04:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:13:19 +0000 (04:13 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:12:45 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Seigo Nonaka [Fri, 17 Jun 2016 03:59:51 +0000 (03:59 +0000)]
Merge "Follow the minikin namespace changes"
Bill Yi [Fri, 17 Jun 2016 02:45:54 +0000 (19:45 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: I450ba7622c907e80c033482bfc172191f3b37f0a
Bill Yi [Fri, 17 Jun 2016 02:24:25 +0000 (19:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: I695f05865fc2e7ae823f4ffe1798b3aa31d72e43
Bill Yi [Fri, 17 Jun 2016 02:21:52 +0000 (19:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: Iae320ca99c6b3f680aac48a15c116ba64943402b
OSDN Git Service
