OSDN Git Service
Siyamed Sinir [Wed, 8 Jun 2016 00:59:44 +0000 (00:59 +0000)]
Merge \\"Fix int overflow in SpannableStringBuilder.replace\\" into nyc-dev am:
96c3e5504b
am:
df3d144b17
Change-Id: I50d759b3865fe66e23f5bc82199c9b512a3489c1
Siyamed Sinir [Wed, 8 Jun 2016 00:56:45 +0000 (00:56 +0000)]
Merge \\"Fix int overflow in SpannableStringBuilder.replace\\" into nyc-dev am:
96c3e5504b
am:
9eddf7ae8e
Change-Id: I2901fa9b6debdac559637732cc5e4eaf4eed8467
Android Build Merger (Role) [Wed, 8 Jun 2016 00:50:46 +0000 (00:50 +0000)]
Merge "Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am:
c82a2b5358 am:
66c2bfcede" into nyc-mr1-dev-plus-aosp
Andreas Gampe [Wed, 8 Jun 2016 00:50:17 +0000 (00:50 +0000)]
Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am:
c82a2b5358
am:
66c2bfcede
Change-Id: I3c4525f3931443aa6a2e16816924850e41c952b7
Siyamed Sinir [Wed, 8 Jun 2016 00:50:15 +0000 (00:50 +0000)]
Merge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev
am:
96c3e5504b
Change-Id: I98179e88a6ce8838dd84131b9402255920822856
Siyamed Sinir [Wed, 8 Jun 2016 00:50:14 +0000 (00:50 +0000)]
Merge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev
am:
96c3e5504b
Change-Id: Ibac22676dcfcd8874bc2415f7fb4f76849896748
Andreas Gampe [Wed, 8 Jun 2016 00:50:03 +0000 (00:50 +0000)]
Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am:
c82a2b5358
am:
89b7934905
Change-Id: Idaa84ae75512929656f63318db819232f42d91f7
Siyamed Sinir [Wed, 8 Jun 2016 00:46:27 +0000 (00:46 +0000)]
Merge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev
Android Build Merger (Role) [Wed, 8 Jun 2016 00:46:12 +0000 (00:46 +0000)]
Merge "Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am:
4401e24add am:
2cf5b73c0a" into nyc-mr1-dev-plus-aosp
Andreas Gampe [Wed, 8 Jun 2016 00:45:35 +0000 (00:45 +0000)]
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
am:
c82a2b5358
Change-Id: I3da283b088e2e0d689ac35d634823497fa2fece1
Jim Miller [Wed, 8 Jun 2016 00:45:35 +0000 (00:45 +0000)]
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am:
4401e24add
am:
2cf5b73c0a
Change-Id: Ie2c8adbeefaab6f9fa1ff6802d938e31be065b84
Andreas Gampe [Wed, 8 Jun 2016 00:45:34 +0000 (00:45 +0000)]
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
am:
c82a2b5358
Change-Id: I9ff1746643acbbf8663b6e1c5fce553e4f803df4
Jim Miller [Wed, 8 Jun 2016 00:43:48 +0000 (00:43 +0000)]
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am:
4401e24add
am:
21c77ed1a8
Change-Id: I7c561e027b7216686b8d096ac97e6c6c5a633eaf
TreeHugger Robot [Wed, 8 Jun 2016 00:38:59 +0000 (00:38 +0000)]
Merge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev
Jim Miller [Wed, 8 Jun 2016 00:38:31 +0000 (00:38 +0000)]
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am:
4401e24add
Change-Id: Ic10c6505e4583f487a41eb659227b955013949b7
Jim Miller [Wed, 8 Jun 2016 00:38:25 +0000 (00:38 +0000)]
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am:
4401e24add
Change-Id: Ibe8709900618cc5d9c5ca18a88ca6fce8c552d54
TreeHugger Robot [Wed, 8 Jun 2016 00:31:28 +0000 (00:31 +0000)]
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
Sharvil Nanavati [Tue, 7 Jun 2016 23:47:39 +0000 (23:47 +0000)]
Merge \"Fix build break by adding missing parenthesis.\" into nyc-mr1-dev
am:
f4f7c64c75
Change-Id: Ie10bd4ea8d7345550fb4a42090320d31669321fa
Sharvil Nanavati [Tue, 7 Jun 2016 23:43:43 +0000 (23:43 +0000)]
Merge "Fix build break by adding missing parenthesis." into nyc-mr1-dev
Sharvil Nanavati [Tue, 7 Jun 2016 23:41:16 +0000 (16:41 -0700)]
Fix build break by adding missing parenthesis.
Change-Id: Ia9a47e24b25e3093f19aeea297a86964c8f00722
David Sehr [Tue, 7 Jun 2016 23:16:40 +0000 (23:16 +0000)]
Merge \\"Add usage line for dump-profiles\\" into nyc-dev am:
a85c1e8e69
am:
eff498946f
Change-Id: I763463605dd5ed84aec0f3c6502f944fefe24388
David Sehr [Tue, 7 Jun 2016 23:13:11 +0000 (23:13 +0000)]
Merge \\"Add usage line for dump-profiles\\" into nyc-dev am:
a85c1e8e69
am:
514c1ae4c6
Change-Id: I798f8c789c8735462c556c6c1c469a1abe1f6f4a
David Sehr [Tue, 7 Jun 2016 23:10:07 +0000 (23:10 +0000)]
Merge \"Add usage line for dump-profiles\" into nyc-dev
am:
a85c1e8e69
Change-Id: I62cf1d3c0ea6295500fbb730dfa75e7046c8c06d
David Sehr [Tue, 7 Jun 2016 23:07:41 +0000 (23:07 +0000)]
Merge \"Add usage line for dump-profiles\" into nyc-dev
am:
a85c1e8e69
Change-Id: I301304ff28674e00c8c1d49b968f090838ae64b3
Dirk Dougherty [Tue, 7 Jun 2016 23:04:33 +0000 (23:04 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb am:
ba9c3d585f am:
f5c85abac6 am:
f91783c8a5
am:
ba446488aa
Change-Id: Ieff4647f43be330106f0d0af61c8c285c3804508
Dirk Dougherty [Tue, 7 Jun 2016 23:02:51 +0000 (23:02 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb am:
ba9c3d585f am:
f5c85abac6 am:
f91783c8a5
am:
db4948a1d3
Change-Id: I4c707846a9dd911f96e57bb0ba91deb7a7d3c94d
Andreas Gampe [Tue, 7 Jun 2016 23:02:23 +0000 (16:02 -0700)]
Frameworks/base: Fix FastPrintWriter infinite loop
Check for error condition in loop.
Bug:
29123428
Change-Id: I361ed27ecb8f05512d7e17f8045f3d34667d32d8
David Sehr [Tue, 7 Jun 2016 23:01:09 +0000 (23:01 +0000)]
Merge "Add usage line for dump-profiles" into nyc-dev
Dirk Dougherty [Tue, 7 Jun 2016 22:57:42 +0000 (22:57 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb am:
ba9c3d585f am:
f5c85abac6
am:
f91783c8a5
Change-Id: I887922ef823327cb484c113f1b4d85ebf01f9576
Dirk Dougherty [Tue, 7 Jun 2016 22:57:41 +0000 (22:57 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb am:
ba9c3d585f am:
f5c85abac6
am:
f91783c8a5
Change-Id: I1094dd6a0a256ce7dd4942ce02374b4b44786278
Dirk Dougherty [Tue, 7 Jun 2016 22:53:20 +0000 (22:53 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb am:
ba9c3d585f
am:
f5c85abac6
Change-Id: I2ea6f9370725235b9d63f6c5a843e42b09361315
Dirk Dougherty [Tue, 7 Jun 2016 22:48:17 +0000 (22:48 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb
am:
ba9c3d585f
Change-Id: I6f250c2b9733562e388e2cd81ab9b7c365bb3c9a
Dirk Dougherty [Tue, 7 Jun 2016 22:45:30 +0000 (22:45 +0000)]
Minor fixes to distribute cards and fab.
am:
5ec3a404fb
Change-Id: I47c10ecd60b616bd0f343cb2309820c800d5a077
Dirk Dougherty [Tue, 7 Jun 2016 22:39:03 +0000 (15:39 -0700)]
Minor fixes to distribute cards and fab.
Change-Id: I125162be9d53faef0c477a2e2592624bb5869ff4
Brad Ebinger [Tue, 7 Jun 2016 22:23:50 +0000 (22:23 +0000)]
Merge \"Adds CDMA Voice Privacy Property to Call\" into nyc-mr1-dev
am:
5eebdd8bb8
Change-Id: Ie647b2b460dded6a501f5c19849d610c29d5ebaa
Sharvil Nanavati [Tue, 7 Jun 2016 22:23:38 +0000 (22:23 +0000)]
Merge \"Fix flaky discoverable stress test.\" into nyc-mr1-dev
am:
9e67da47f3
Change-Id: I5583238b6de24571762c656253510b469cd810f1
Brad Ebinger [Tue, 7 Jun 2016 22:14:50 +0000 (22:14 +0000)]
Merge "Adds CDMA Voice Privacy Property to Call" into nyc-mr1-dev
Sharvil Nanavati [Tue, 7 Jun 2016 22:14:21 +0000 (22:14 +0000)]
Merge "Fix flaky discoverable stress test." into nyc-mr1-dev
Android Build Merger (Role) [Tue, 7 Jun 2016 22:05:18 +0000 (22:05 +0000)]
Merge "docs: Added CL commands for data-saver testing am:
b603eae9b3 am:
2d05938af9 am:
d0ef8a0147 am:
16ac726542" into nyc-mr1-dev-plus-aosp
Eric Schmidt [Tue, 7 Jun 2016 22:04:44 +0000 (22:04 +0000)]
docs: Added CL commands for data-saver testing am:
b603eae9b3 am:
2d05938af9 am:
d0ef8a0147
am:
16ac726542
Change-Id: I75b8179c1c4222f7d50c4c645d0fb447656b4661
Eric Schmidt [Tue, 7 Jun 2016 22:04:40 +0000 (22:04 +0000)]
docs: Added CL commands for data-saver testing am:
b603eae9b3 am:
2d05938af9 am:
d0ef8a0147
am:
3fa7b269ea
Change-Id: I6d7d64cda55b6c0ec497b5d2802d68a821a68242
Sharvil Nanavati [Tue, 7 Jun 2016 20:35:59 +0000 (13:35 -0700)]
Fix flaky discoverable stress test.
Bug:
28980767
Change-Id: I6858456f58118a3385b05d42361a5c9223ebbdc4
Eric Schmidt [Tue, 7 Jun 2016 21:57:52 +0000 (21:57 +0000)]
docs: Added CL commands for data-saver testing am:
b603eae9b3 am:
2d05938af9
am:
d0ef8a0147
* commit '
d0ef8a01470e83c9161e398b804b5264d71a6bb3':
docs: Added CL commands for data-saver testing
Change-Id: Ib66755d430ab387f2af39ed127ecaf3c8193b685
Eric Schmidt [Tue, 7 Jun 2016 21:57:50 +0000 (21:57 +0000)]
docs: Added CL commands for data-saver testing am:
b603eae9b3 am:
2d05938af9
am:
d0ef8a0147
* commit '
d0ef8a01470e83c9161e398b804b5264d71a6bb3':
docs: Added CL commands for data-saver testing
Change-Id: I14490c4309d6318436b8430035de8cb27329141e
Eric Schmidt [Tue, 7 Jun 2016 21:52:54 +0000 (21:52 +0000)]
docs: Added CL commands for data-saver testing am:
b603eae9b3
am:
2d05938af9
* commit '
2d05938af9e572ca9582552ad966c18b7b83e94f':
docs: Added CL commands for data-saver testing
Change-Id: Ic0f9a82f05dc32b162013df51c155f2a1a206c45
Eric Schmidt [Tue, 7 Jun 2016 21:47:47 +0000 (21:47 +0000)]
docs: Added CL commands for data-saver testing
am:
b603eae9b3
* commit '
b603eae9b363ca292d721243819dfd701a194b65':
docs: Added CL commands for data-saver testing
Change-Id: I1f5bf236f72db694ddedfe6552f188242d5f61a1
Pavlin Radoslavov [Tue, 7 Jun 2016 21:47:47 +0000 (21:47 +0000)]
resolve merge conflicts of
ae7641a to nyc-dev-plus-aosp
am:
c7d4074aef
* commit '
c7d4074aef4aee0d7ec7e2d1413cf370f6756291':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: Iac013f281d63fe627f4d216f187619adad2d2ccc
Pavlin Radoslavov [Tue, 7 Jun 2016 21:41:08 +0000 (14:41 -0700)]
resolve merge conflicts of
ae7641a to nyc-dev-plus-aosp
Change-Id: I63d00b98c27d7fa1f30385e030b6ffee5e86dc73
Pavlin Radoslavov [Tue, 7 Jun 2016 21:23:23 +0000 (21:23 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF"
am:
98cf9d1a60
* commit '
98cf9d1a606e17b5eeedad5fff9bb5935ebb370b':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: I4461a40459828079ced3b0af313e39825e009bc8
Eric Schmidt [Tue, 31 May 2016 22:56:48 +0000 (15:56 -0700)]
docs: Added CL commands for data-saver testing
Bug:
28951799
Change-Id: I03ae59b1d98b8e58dc859c8158b318718c8a9f13
Treehugger Robot [Tue, 7 Jun 2016 21:14:21 +0000 (21:14 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF"
Sanket Padawe [Tue, 7 Jun 2016 21:00:49 +0000 (21:00 +0000)]
Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev
am:
2e9b43efd5
* commit '
2e9b43efd53fbbce733b6e5c328f37c635c699a3':
Fix bug while writing data to parcel in TelephonyHistogram.java
Change-Id: I47cce50a4fdcc0bf4c747a410dd07658424dd9f3
Sanket Padawe [Tue, 7 Jun 2016 20:52:58 +0000 (20:52 +0000)]
Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev
Pavlin Radoslavov [Thu, 2 Jun 2016 05:25:18 +0000 (22:25 -0700)]
Delay handleEnable() until Bluetooth state is OFF
During shutdown of the Bluetooth stack, if a request to
enable Bluetooth is received, the request is processed immediately.
As a result, we don't let the Bluetooth service to shutdown cleanly,
and the Bluetooth process with the native backend doesn't go away.
This creates various issues in the native backend stack.
Now, after an enable request is received, if necessary we delay
acting on it, until the Bluetooth state is OFF.
Bug:
17723234
Change-Id: I55db4bbd4f45227aa49eae996dcc328f76557a9b
(cherry picked from commit
e47ec14318f64c29bf16b5a6bb662bc19206d6b0)
ganxiaolin [Tue, 7 Jun 2016 18:19:06 +0000 (18:19 +0000)]
Merge "Delete Visualizer before lpJniStorage" am:
03c209b2a3 am:
913e2f83b2
am:
c8e1206ad5
* commit '
c8e1206ad57f5a359b1e4a193f50f143c9028439':
Delete Visualizer before lpJniStorage
Change-Id: Ie6c74e2d0256a98f76cd19b3475e94331d3f8d49
Eric Laurent [Tue, 7 Jun 2016 18:13:09 +0000 (18:13 +0000)]
Merge "Delete Visualizer before lpJniStorage" am:
03c209b2a3
am:
913e2f83b2
* commit '
913e2f83b223486ac1461dab86758848f9ad08e1':
Delete Visualizer before lpJniStorage
Change-Id: I76aa735d8f0a100e0e106050c90966bd003235bc
ganxiaolin [Tue, 7 Jun 2016 18:07:25 +0000 (18:07 +0000)]
Merge "Delete Visualizer before lpJniStorage"
am:
03c209b2a3
* commit '
03c209b2a3544e3a8ca087bb28b99bd623f16098':
Delete Visualizer before lpJniStorage
Change-Id: Id685a9b6a4735bd2ef34a9d10fba50e37844dc19
Android Build Merger (Role) [Tue, 7 Jun 2016 18:04:20 +0000 (18:04 +0000)]
Merge "Merge "resolve merge conflicts of
b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am:
e61d3ff3d1" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 7 Jun 2016 18:04:11 +0000 (18:04 +0000)]
Merge "Merge "Fix getApplicationRestrictions documentation" into nyc-dev am:
a86d6c4df3 am:
36ff488bb4" into nyc-mr1-dev-plus-aosp
Xin Li [Tue, 7 Jun 2016 18:03:36 +0000 (18:03 +0000)]
Merge "resolve merge conflicts of
b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am:
e61d3ff3d1
* commit '
e61d3ff3d131c2f28adee085557cd93853af5e72':
Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService.
Change-Id: Ia6f1c88bba68df6660d7e91e4bedebda22bcf5c5
Esteban Talavera [Tue, 7 Jun 2016 18:03:33 +0000 (18:03 +0000)]
Merge "Fix getApplicationRestrictions documentation" into nyc-dev am:
a86d6c4df3
am:
36ff488bb4
* commit '
36ff488bb475d52629fea412dcd7af57bb3d441f':
Fix getApplicationRestrictions documentation
Change-Id: I6ab4757ac9991377ca1003dbf09afceb5dc86d18
Esteban Talavera [Tue, 7 Jun 2016 18:03:32 +0000 (18:03 +0000)]
Merge "Fix getApplicationRestrictions documentation" into nyc-dev am:
a86d6c4df3
am:
cc12064670
* commit '
cc12064670c9e0ade3ffcb4ff2eed4ddd5d267a8':
Fix getApplicationRestrictions documentation
Change-Id: I7715a46ef865e3e4e936c2baea5e6c52e4783e8d
Eric Laurent [Tue, 7 Jun 2016 18:00:28 +0000 (18:00 +0000)]
Merge "Delete Visualizer before lpJniStorage"
TreeHugger Robot [Tue, 7 Jun 2016 18:00:24 +0000 (18:00 +0000)]
Merge "resolve merge conflicts of
b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
Esteban Talavera [Tue, 7 Jun 2016 17:59:02 +0000 (17:59 +0000)]
Merge "Fix getApplicationRestrictions documentation" into nyc-dev
am:
a86d6c4df3
* commit '
a86d6c4df3b193060b4b725e1abfed4f69689843':
Fix getApplicationRestrictions documentation
Change-Id: Idaab3c8f765d5e5631aa69557a9c3f194c9d5d33
Esteban Talavera [Tue, 7 Jun 2016 17:59:01 +0000 (17:59 +0000)]
Merge "Fix getApplicationRestrictions documentation" into nyc-dev
am:
a86d6c4df3
* commit '
a86d6c4df3b193060b4b725e1abfed4f69689843':
Fix getApplicationRestrictions documentation
Change-Id: Ia552cc886a182f558b7479b1d2a0201061dc5cc6
Esteban Talavera [Tue, 7 Jun 2016 17:55:16 +0000 (17:55 +0000)]
Merge "Fix getApplicationRestrictions documentation" into nyc-dev
Esteban Talavera [Tue, 7 Jun 2016 14:25:20 +0000 (15:25 +0100)]
Fix getApplicationRestrictions documentation
The method never returns null, only empty bundle
Bug:
29178626
Change-Id: Ic53154eafe94c6c501b59932441d7ae1c89cb689
Adarsh Fernando [Tue, 7 Jun 2016 16:21:38 +0000 (16:21 +0000)]
Redirect for AS error message regarding SDK license agreements am:
5fb0843a7f am:
fc329098d2 am:
79cb94b8d6
am:
779adf8879
* commit '
779adf8879f94ffa97d0f889f1376c5bb3929ef4':
Bug:
28875393 Bug:
28879732
Change-Id: I0e09b58fe2627f0858d44eb52807726c03f32760
Android Build Merger (Role) [Tue, 7 Jun 2016 16:17:04 +0000 (16:17 +0000)]
Merge "Redirect for AS error message regarding SDK license agreements am:
5fb0843a7f am:
fc329098d2 am:
79cb94b8d6 am:
9d5009e793" into nyc-mr1-dev-plus-aosp
Adarsh Fernando [Tue, 7 Jun 2016 16:16:40 +0000 (16:16 +0000)]
Redirect for AS error message regarding SDK license agreements am:
5fb0843a7f am:
fc329098d2 am:
79cb94b8d6
am:
9d5009e793
* commit '
9d5009e7930d78a5ba62f0cb99ab2a4fce87f59a':
Redirect for AS error message regarding SDK license agreements
Change-Id: I2500b643822083f90aca566915d508d794dde0ff
Adarsh Fernando [Tue, 7 Jun 2016 16:16:37 +0000 (16:16 +0000)]
Redirect for AS error message regarding SDK license agreements am:
5fb0843a7f am:
fc329098d2 am:
79cb94b8d6
am:
7aa88881b1
* commit '
7aa88881b14cb71d10a0e62409c8a7bf514ba1eb':
Redirect for AS error message regarding SDK license agreements
Change-Id: I7d5146bb06403a8f3acd85bd84baf6901a5f9bfd
William Harmon [Tue, 7 Jun 2016 16:15:37 +0000 (16:15 +0000)]
Merge "Bug:
28875393 Bug:
28879732" into nyc-mr1-dev
David Sehr [Tue, 7 Jun 2016 16:11:27 +0000 (09:11 -0700)]
Add usage line for dump-profiles
Previous commit did not include the usage line to be printed when user types
adb shell cmd package
Bug:
28748264
Change-Id: I0a684dbc44c8cc5ec7cd4eba82ce18feed53368c
Adarsh Fernando [Tue, 7 Jun 2016 16:10:31 +0000 (16:10 +0000)]
Redirect for AS error message regarding SDK license agreements am:
5fb0843a7f am:
fc329098d2
am:
79cb94b8d6
* commit '
79cb94b8d6f6edcb10744fc81b81d38a0b2edda6':
Redirect for AS error message regarding SDK license agreements
Change-Id: Id2e257b316587c427bc1cf45b579f1fedee58595
Adarsh Fernando [Tue, 7 Jun 2016 16:10:30 +0000 (16:10 +0000)]
Redirect for AS error message regarding SDK license agreements am:
5fb0843a7f am:
fc329098d2
am:
79cb94b8d6
* commit '
79cb94b8d6f6edcb10744fc81b81d38a0b2edda6':
Redirect for AS error message regarding SDK license agreements
Change-Id: I56a305f47f468464ae11b48396342d1e7ade239f
Adarsh Fernando [Tue, 7 Jun 2016 16:04:39 +0000 (16:04 +0000)]
Redirect for AS error message regarding SDK license agreements am:
5fb0843a7f
am:
fc329098d2
* commit '
fc329098d29ca24f2607af356cb19d23cafe6788':
Redirect for AS error message regarding SDK license agreements
Change-Id: I59913b492063dd64c9c4d17784c9711f9d23fbad
Adarsh Fernando [Tue, 7 Jun 2016 16:01:48 +0000 (16:01 +0000)]
Redirect for AS error message regarding SDK license agreements
am:
5fb0843a7f
* commit '
5fb0843a7f276d8f597e8e6337d60e2901afd430':
Redirect for AS error message regarding SDK license agreements
Change-Id: Ia741036afbe6d28082a63853ca3aaada487f7d53
Adarsh Fernando [Tue, 7 Jun 2016 03:58:18 +0000 (20:58 -0700)]
Redirect for AS error message regarding SDK license agreements
- error message will provide a link to doc about importing
license agreements from another workstatio
- Doc currently on TAC, may move to DAC
Change-Id: Iee2839f1dc7b6a5a1fb5a90ad499e1b0cddf5068
Bill Yi [Tue, 7 Jun 2016 03:29:02 +0000 (03:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
2b92ce7aaa -s ours
am:
b77c51b2cf -s ours
* commit '
b77c51b2cf5554b74a8af04b1deac7e25a88dae8':
Change-Id: I031acc52eb9560aa9186ff0336b1d5fa7ac8c074
Andreas Gampe [Tue, 7 Jun 2016 03:28:59 +0000 (03:28 +0000)]
Frameworks/base: Update compiled-classes-phone am:
e16dc04bd8
am:
1b84a84f95
* commit '
1b84a84f957e256a920b463862b4f95c0f1b3aa9':
Change-Id: I7d60064c2a306ae11fb18833ae3d83c6ac915b30
Bill Yi [Tue, 7 Jun 2016 03:25:44 +0000 (03:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
2b92ce7aaa -s ours
am:
0118fbd3ef -s ours
* commit '
0118fbd3ef557461ab4725a06eb9064d622cf88f':
Import translations. DO NOT MERGE
Change-Id: Icf798098101b876a050d56dedfb417e27b742971
Andreas Gampe [Tue, 7 Jun 2016 03:25:41 +0000 (03:25 +0000)]
Frameworks/base: Update compiled-classes-phone am:
e16dc04bd8
am:
ae702d305f
* commit '
ae702d305ff44a0e4ec59d3a9c5fb153e77587eb':
Frameworks/base: Update compiled-classes-phone
Change-Id: I10469b84f9f291d931562f7b71be39bc232a86f9
Andreas Gampe [Tue, 7 Jun 2016 03:25:36 +0000 (03:25 +0000)]
Merge "Frameworks/base: Update preloaded-classes" into nyc-dev am:
ba94385e5f
am:
270657c8e7
* commit '
270657c8e7d429a7f296c8d2789e7b16ff7ffdd8':
Change-Id: Ica8a7d1eddf7b2b0529160e9af9a39f21f744f8b
Bill Yi [Tue, 7 Jun 2016 03:21:18 +0000 (03:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
2b92ce7aaa -s ours
* commit '
2b92ce7aaa5a0f22a742cd688488c8b8b05ce82b':
Import translations. DO NOT MERGE
Change-Id: I058751b2d6f3b01944659df2008956518cbef05b
Andreas Gampe [Tue, 7 Jun 2016 03:21:14 +0000 (03:21 +0000)]
Frameworks/base: Update compiled-classes-phone
am:
e16dc04bd8
* commit '
e16dc04bd82464a289eb00f807293c1da33c179c':
Frameworks/base: Update compiled-classes-phone
Change-Id: I93ae930e1154c523169f144c90918fd07b198f86
Bill Yi [Tue, 7 Jun 2016 03:21:09 +0000 (03:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
2b92ce7aaa -s ours
* commit '
2b92ce7aaa5a0f22a742cd688488c8b8b05ce82b':
Import translations. DO NOT MERGE
Change-Id: Iec4e17778428bdda04d9ea34010abbdfcfede9c5
Andreas Gampe [Tue, 7 Jun 2016 03:21:06 +0000 (03:21 +0000)]
Frameworks/base: Update compiled-classes-phone
am:
e16dc04bd8
* commit '
e16dc04bd82464a289eb00f807293c1da33c179c':
Frameworks/base: Update compiled-classes-phone
Change-Id: I6a02ffbf03e5dc22b21c54cc24268f4e6b54459c
Andreas Gampe [Tue, 7 Jun 2016 03:21:05 +0000 (03:21 +0000)]
Merge "Frameworks/base: Update preloaded-classes" into nyc-dev am:
ba94385e5f
am:
572b0daf85
* commit '
572b0daf851126aceefdd3496d41e4352f13898c':
Frameworks/base: Update preloaded-classes
Change-Id: Id211354ff06f7cd70fdcbb363c0573d004947cfc
Bill Yi [Tue, 7 Jun 2016 03:18:19 +0000 (03:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
4ce8e19231 -s ours
* commit '
4ce8e1923168f0ccbd0e7c5acd159c827d55f101':
Import translations. DO NOT MERGE
Change-Id: Ibc743845940e3d6f43b6d54f2d991fe8fa2d2a94
Andreas Gampe [Tue, 7 Jun 2016 03:17:06 +0000 (03:17 +0000)]
Merge "Frameworks/base: Update preloaded-classes" into nyc-dev
am:
ba94385e5f
* commit '
ba94385e5f8af1556755a7fa5c8e9c3bcb3e5fb0':
Frameworks/base: Update preloaded-classes
Change-Id: I2c918b2207331cad8d2904f4f314cf9490c4ccac
Andreas Gampe [Tue, 7 Jun 2016 03:17:03 +0000 (03:17 +0000)]
Merge "Frameworks/base: Update preloaded-classes" into nyc-dev
am:
ba94385e5f
* commit '
ba94385e5f8af1556755a7fa5c8e9c3bcb3e5fb0':
Frameworks/base: Update preloaded-classes
Change-Id: Iaf5270f03ef6214b9d3064f19aa0219b422687c5
TreeHugger Robot [Tue, 7 Jun 2016 03:13:21 +0000 (03:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 7 Jun 2016 03:12:33 +0000 (03:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Andreas Gampe [Sat, 4 Jun 2016 00:40:34 +0000 (17:40 -0700)]
Frameworks/base: Update compiled-classes-phone
Another update.
Bug:
27248115
Change-Id: Ia208b37e9b9b649215ad1024ba0438627bc89f8a
TreeHugger Robot [Tue, 7 Jun 2016 03:09:54 +0000 (03:09 +0000)]
Merge "Frameworks/base: Update preloaded-classes" into nyc-dev
Bill Yi [Tue, 7 Jun 2016 02:40:50 +0000 (02:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
f3d2c06146 -s ours
am:
90c64f02f2 -s ours
* commit '
90c64f02f20db0b918c3b9c26d76a8dce3e4e576':
Change-Id: I9e305546e7aac8e3f40814633b2450ce3897b713
Bill Yi [Tue, 7 Jun 2016 02:40:46 +0000 (02:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
93e807485e -s ours
am:
e4872d1849 -s ours
* commit '
e4872d1849a265e577b9ef66fd0658da897fecce':
Change-Id: I9e555f56da7dcd1ce04406fc80d8716ad4e4cc36
Android Build Merger (Role) [Tue, 7 Jun 2016 02:34:05 +0000 (02:34 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
f3d2c06146 -s ours am:
b3d3104969 -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 7 Jun 2016 02:33:44 +0000 (02:33 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
93e807485e -s ours am:
a2a976498e -s ours" into nyc-mr1-dev-plus-aosp
OSDN Git Service
