OSDN Git Service
TreeHugger Robot [Fri, 17 Jun 2016 01:33:47 +0000 (01:33 +0000)]
Merge "[multi-part] Eliminate 1k selection limit"
TreeHugger Robot [Fri, 17 Jun 2016 01:28:52 +0000 (01:28 +0000)]
Merge "Quick fix for Files crashing on start up."
Sergei Vasilinetc [Fri, 17 Jun 2016 00:57:50 +0000 (00:57 +0000)]
Merge "Test scene that mocks list view with text items faded on left edge."
Steve McKay [Thu, 9 Jun 2016 17:46:07 +0000 (10:46 -0700)]
[multi-part] Eliminate 1k selection limit
* Save selection to disk, delete old selections on app startup.
* Do clipper work in background for copy/cut.
* Pull DragShadowBuilder out of DirFragment.
* Reorganize selection handling to avoid creation of large lists of objects.
* Eliminate getAll from selection, make it iterable, remove unused method.
* Avoid creating DocumentInfo instances for full selection when initiating drag and drop.
Next step will be to pass selection tokens to FileOperationService.
Change-Id: Ia3e30a88ebf328e5b045d06b0df15dbd26a01a42
(cherry picked from commit
69b63de63ddae8d1a3ad8fa49a0beb1ff6f921e1)
sergeyv [Thu, 16 Jun 2016 21:52:20 +0000 (14:52 -0700)]
Test scene that mocks list view with text items faded on left edge.
Change-Id: I6159f02fa511241beaff4f0eb605c4f0bee360d1
Ben Lin [Thu, 16 Jun 2016 21:06:05 +0000 (14:06 -0700)]
Quick fix for Files crashing on start up.
Change-Id: I98df90b6bdf5caacb7565ead7051e507abfff23d
TreeHugger Robot [Thu, 16 Jun 2016 20:31:23 +0000 (20:31 +0000)]
Merge "Poll jobs' status to update notifications."
TreeHugger Robot [Thu, 16 Jun 2016 20:21:16 +0000 (20:21 +0000)]
Merge "Implementation of Right-click context menus for docs/files."
Richard Ho [Thu, 16 Jun 2016 18:57:27 +0000 (18:57 +0000)]
Merge "merge fix"
Garfield, Tan [Thu, 9 Jun 2016 19:04:22 +0000 (12:04 -0700)]
Poll jobs' status to update notifications.
Bug:
27249491
Change-Id: I8912c781582af1789c8f76dea06879a3dde75d34
Ben Lin [Fri, 3 Jun 2016 20:46:52 +0000 (13:46 -0700)]
Implementation of Right-click context menus for docs/files.
Bug:
24416336
Change-Id: I675baf4abf6308bc1f6c3b4171f7251b0f3fd6e4
(cherry picked from commit
be70710de3e1507292381cd14a9e1c1343ff2524)
Yi Kong [Thu, 16 Jun 2016 17:26:48 +0000 (17:26 +0000)]
Merge \\\\"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\\\\" am:
1850851670 am:
f5bdd8eae6 am:
b72fa52282
am:
a05075f743
Change-Id: Idb7d4edd9de00025ae4af04c446654b1e7d8819b
Makoto Onuki [Thu, 16 Jun 2016 17:17:56 +0000 (17:17 +0000)]
Merge \\"Shortcut: Reset throttling upon inline reply\\" into nyc-mr1-dev am:
489bafbb4b
am:
58b2258506
Change-Id: I7034cc9ef130c9dccfa35a8cb75940d717a2a15d
Yi Kong [Thu, 16 Jun 2016 17:14:43 +0000 (17:14 +0000)]
Merge \\\"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\\\" am:
1850851670 am:
f5bdd8eae6
am:
b72fa52282
Change-Id: I512681e5a601e5d1e36979afef1fa3c443b2222c
Dan Willemsen [Thu, 16 Jun 2016 17:12:02 +0000 (17:12 +0000)]
resolve merge conflicts of
20d55a7 to stage-aosp-master am:
5f551b3fdc am:
fd1854cdfa
am:
04e9d830b0
Change-Id: I4add0a1b114c4e56343484acb9e855137e720be3
Makoto Onuki [Thu, 16 Jun 2016 17:10:42 +0000 (17:10 +0000)]
Merge \"Shortcut: Reset throttling upon inline reply\" into nyc-mr1-dev
am:
489bafbb4b
Change-Id: I5c8dc7f3c1e5860ea870d88b2ff7fc2a86a4ba39
Yi Kong [Thu, 16 Jun 2016 17:08:09 +0000 (17:08 +0000)]
Merge \\"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" am:
1850851670
am:
f5bdd8eae6
Change-Id: Iea16189bfbce1b11fa4a91501daba94c2c83a380
Dan Willemsen [Thu, 16 Jun 2016 17:07:15 +0000 (17:07 +0000)]
resolve merge conflicts of
20d55a7 to stage-aosp-master am:
5f551b3fdc
am:
fd1854cdfa
Change-Id: I6942aa753a512f0a24725de0ea72ed20c067ad15
Makoto Onuki [Thu, 16 Jun 2016 17:05:54 +0000 (17:05 +0000)]
Merge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev
Yi Kong [Thu, 16 Jun 2016 17:02:37 +0000 (17:02 +0000)]
Merge \"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\"
am:
1850851670
Change-Id: I6997e3b34d87cb091be99318ea1743c972ca1c84
Dan Willemsen [Thu, 16 Jun 2016 17:01:55 +0000 (17:01 +0000)]
resolve merge conflicts of
20d55a7 to stage-aosp-master
am:
5f551b3fdc
Change-Id: I327901f4bcca937a8376c1a6d604d7293828b0c9
Mahaver Chopra [Thu, 16 Jun 2016 17:00:06 +0000 (17:00 +0000)]
Merge \\"Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem\\" into nyc-mr1-dev am:
186768150f
am:
d3a0f10b8d
Change-Id: I3cc8d0ff8cc97b57262edfb09c07fc91f06cf56c
Dan Willemsen [Thu, 16 Jun 2016 16:54:28 +0000 (09:54 -0700)]
resolve merge conflicts of
20d55a7 to stage-aosp-master
Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59
Mahaver Chopra [Thu, 16 Jun 2016 16:53:43 +0000 (16:53 +0000)]
Merge \"Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem\" into nyc-mr1-dev
am:
186768150f
Change-Id: Id35463500a31ff6e6d834c706e228d05c5d15918
Mahaver Chopra [Thu, 16 Jun 2016 16:49:10 +0000 (16:49 +0000)]
Merge "Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem" into nyc-mr1-dev
Todd Kennedy [Thu, 16 Jun 2016 16:40:44 +0000 (16:40 +0000)]
Merge \"Merge \\\"Make sure we\\\'re locked\\\" into nyc-dev am:
32d67fab83 am:
092d961367\" into nyc-mr1-dev-plus-aosp
am:
b901e4c4e6
Change-Id: Id83cd214744a5114b518236bb7091d2578d47849
Todd Kennedy [Thu, 16 Jun 2016 16:40:42 +0000 (16:40 +0000)]
Merge \\\"Make sure we\\\'re locked\\\" into nyc-dev am:
32d67fab83 am:
e084a08ff5
am:
5574a0618d
Change-Id: I20c7f3dd9ed062a470227ae8c7c7e305cb65730e
Android Build Merger (Role) [Thu, 16 Jun 2016 16:38:10 +0000 (16:38 +0000)]
Merge "Merge \\"Make sure we\\'re locked\\" into nyc-dev am:
32d67fab83 am:
092d961367" into nyc-mr1-dev-plus-aosp
Todd Kennedy [Thu, 16 Jun 2016 16:37:44 +0000 (16:37 +0000)]
Merge \\"Make sure we\\'re locked\\" into nyc-dev am:
32d67fab83
am:
092d961367
Change-Id: Ifbea2336bcb5a38ec71147e905a593b8b3f55416
Todd Kennedy [Thu, 16 Jun 2016 16:37:23 +0000 (16:37 +0000)]
Merge \\"Make sure we\\'re locked\\" into nyc-dev am:
32d67fab83
am:
e084a08ff5
Change-Id: I7cbdcd5d7e917fa290775260d3c30726948d4f4d
Todd Kennedy [Thu, 16 Jun 2016 16:34:34 +0000 (16:34 +0000)]
Merge \"Make sure we\'re locked\" into nyc-dev
am:
32d67fab83
Change-Id: I2f80a7af0ddd6f282cde6c8d9ea79e0c614fba6b
Todd Kennedy [Thu, 16 Jun 2016 16:34:11 +0000 (16:34 +0000)]
Merge \"Make sure we\'re locked\" into nyc-dev
am:
32d67fab83
Change-Id: Iff90d36636b01542ed8a7e088f403b6554cbd91a
Android Build Merger (Role) [Thu, 16 Jun 2016 16:33:42 +0000 (16:33 +0000)]
Merge "Merge \\"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" into nyc-dev-plus-aosp am:
53cf79e185 am:
75aee6f266"
Yi Kong [Thu, 16 Jun 2016 16:33:13 +0000 (16:33 +0000)]
Merge \\"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" into nyc-dev-plus-aosp am:
53cf79e185
am:
75aee6f266
Change-Id: I30a3bc53262cc1f27b3c745af2a9b6a4d6357649
Andrei Stingaceanu [Thu, 16 Jun 2016 16:29:23 +0000 (16:29 +0000)]
Merge "Keyboard shortcuts: A11Y fixes"
Richard Ho [Thu, 16 Jun 2016 16:29:07 +0000 (09:29 -0700)]
merge fix
Change-Id: Ib937f672769dc19b8706c8a0b695ed8a08398df4
Todd Kennedy [Thu, 16 Jun 2016 16:22:53 +0000 (16:22 +0000)]
Merge "Make sure we're locked" into nyc-dev
Yi Kong [Thu, 16 Jun 2016 16:21:03 +0000 (16:21 +0000)]
Merge \"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\" into nyc-dev-plus-aosp
am:
53cf79e185
Change-Id: I7444bfc95144d4d00c20347512a5a5fc0cceebc8
Andrei Stingaceanu [Mon, 13 Jun 2016 16:26:39 +0000 (17:26 +0100)]
Keyboard shortcuts: A11Y fixes
* Letters are no more announced as capitals
* Focus now moves into the function key buttons (images)
* The keyboard shortcuts are not being verbalized individually
but instead the whole group is now verbalized in one go.
Bug:
29267887
Bug:
29259734
Bug:
29260915
Change-Id: Ie2cf519338cbb7d07c2d52b419dcf6b5a9e14147
Yi Kong [Thu, 16 Jun 2016 16:17:48 +0000 (16:17 +0000)]
Merge "Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92" into nyc-dev-plus-aosp
Yi Kong [Thu, 16 Jun 2016 16:16:00 +0000 (16:16 +0000)]
Yi Kong [Mon, 13 Jun 2016 20:14:35 +0000 (21:14 +0100)]
Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
(cherry picked from commit
af823e0ebf987d5715d6df80b3c9335b4e3a2cdb)
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 16:10:47 +0000 (16:10 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c am:
7d09db2830
am:
81368e08e0
Change-Id: Ifa2ca4ef2b9144db318b61cd248000c6e3eb96fe
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 16:07:49 +0000 (16:07 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
am:
7d09db2830
Change-Id: I57f72e630688d91ca56adfb910232358746777e0
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 14:15:17 +0000 (15:15 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
test-current.txt update
Bug:
28666126
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
(cherry picked from commit
aa021e854ef84f7a7aff109b5bec824190f9ebfa)
Treehugger Robot [Thu, 16 Jun 2016 15:56:50 +0000 (15:56 +0000)]
Merge "Remove unused link to libcutils"
Victor Chang [Thu, 16 Jun 2016 15:35:00 +0000 (15:35 +0000)]
Merge \\\"Fix that work apps settings page crash after changing work profile to use separated lock\\\" into nyc-dev am:
6437205648 am:
9feb501659
am:
2b59387499
Change-Id: I65b9ecc84c763721ce5c943fdd9a7f682f770da4
Victor Chang [Thu, 16 Jun 2016 15:29:56 +0000 (15:29 +0000)]
Merge \\\"Fix that work apps settings page crash after changing work profile to use separated lock\\\" into nyc-dev am:
6437205648 am:
1e29965a85
am:
bba7856588
Change-Id: Iba5f5f63a78e7f9e68465fa5598d6c6baf555771
Victor Chang [Thu, 16 Jun 2016 15:28:55 +0000 (15:28 +0000)]
Merge \\"Fix that work apps settings page crash after changing work profile to use separated lock\\" into nyc-dev am:
6437205648
am:
9feb501659
Change-Id: I0cd6a92a70d8f3310ab1a07709aefe6d42a57412
Victor Chang [Thu, 16 Jun 2016 15:24:23 +0000 (15:24 +0000)]
Merge \\"Fix that work apps settings page crash after changing work profile to use separated lock\\" into nyc-dev am:
6437205648
am:
1e29965a85
Change-Id: Iad489061a9f91d17097f45ff10da50f9210733a1
Victor Chang [Thu, 16 Jun 2016 15:21:12 +0000 (15:21 +0000)]
Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev
am:
6437205648
Change-Id: Id19fe2488406a3891cd433d8b1e9273a28b48fbb
Victor Chang [Thu, 16 Jun 2016 15:21:07 +0000 (15:21 +0000)]
Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev
am:
6437205648
Change-Id: If23d7b5ab2c79874714a9f6a67625b09e7f83699
Victor Chang [Thu, 16 Jun 2016 15:13:32 +0000 (15:13 +0000)]
Merge "Fix that work apps settings page crash after changing work profile to use separated lock" into nyc-dev
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 14:15:17 +0000 (15:15 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
test-current.txt update
Bug:
28666126
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
Todd Kennedy [Wed, 15 Jun 2016 16:54:28 +0000 (09:54 -0700)]
Make sure we're locked
Before calling a method ending with LPw, we need to have the mPackages lock.
Make sure we do that.
Also, ditch the iterator for traversing an ArraySet.
Bug:
29356333
Change-Id: I67df971f2961b577f31153cef46fb153458d6965
Mahaver Chopra [Thu, 16 Jun 2016 13:05:58 +0000 (14:05 +0100)]
Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem
Bug:
29409746
Change-Id: I5254456cc2364c93809cebbe2d134a873873790d
Andrei Stingaceanu [Thu, 16 Jun 2016 13:41:49 +0000 (13:41 +0000)]
Merge "DatePicker A11Y fix time announced for date widgets"
Yi Kong [Mon, 13 Jun 2016 20:14:35 +0000 (21:14 +0100)]
Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
Joachim Sauer [Thu, 16 Jun 2016 13:17:47 +0000 (13:17 +0000)]
Merge \\\\"API updated for ICU4J 57.1\\\\" am:
4861329f57 am:
438dc91a41 am:
69147f24ae
am:
3ac8348d00
Change-Id: I811b6eabe9587c704afac941bbf1385798f7957b
Fredrik Roubert [Thu, 16 Jun 2016 13:12:13 +0000 (13:12 +0000)]
Merge \\\"API updated for ICU4J 57.1\\\" am:
4861329f57 am:
438dc91a41
am:
69147f24ae
Change-Id: Ic62119248aeef08141a3f6a9b2d948529997cbcc
Joachim Sauer [Thu, 16 Jun 2016 13:09:12 +0000 (13:09 +0000)]
Merge \\"API updated for ICU4J 57.1\\" am:
4861329f57
am:
438dc91a41
Change-Id: I16a88e2346435b60cc7844784f30be82a775bf5d
Fredrik Roubert [Thu, 16 Jun 2016 13:03:50 +0000 (13:03 +0000)]
Merge \"API updated for ICU4J 57.1\"
am:
4861329f57
Change-Id: I28a8fe77f81a0cb24ed7044046c06677b44c812c
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:46:19 +0000 (12:46 +0000)]
Merge \\\\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\\\" am:
47ef3bf172 am:
d37e23c50c am:
720f31e238
am:
90e517991b
Change-Id: Iac9e82f2ca567d8f56d556f5dd0a8339cccb153e
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:42:40 +0000 (12:42 +0000)]
Merge \\\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\\" am:
47ef3bf172 am:
d37e23c50c
am:
720f31e238
Change-Id: I97f561820d6cb9550e92c2bf2b83017889afc069
Joachim Sauer [Thu, 16 Jun 2016 12:38:29 +0000 (12:38 +0000)]
Merge "API updated for ICU4J 57.1"
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:38:20 +0000 (12:38 +0000)]
Merge \\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\" am:
47ef3bf172
am:
d37e23c50c
Change-Id: I852b8efb010fecf7079679694c45d6d8300ea408
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:33:21 +0000 (12:33 +0000)]
Merge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\"
am:
47ef3bf172
Change-Id: I15352fb15ffb6d427ddf92cb084c2cfc4c0f8368
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:26:51 +0000 (12:26 +0000)]
Merge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c"
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:07:31 +0000 (13:07 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Bug:
28666126
Change-Id: I52b859a5504536413f74c1e27d3eb7f1f930dc20
Andrei Stingaceanu [Thu, 16 Jun 2016 11:00:39 +0000 (12:00 +0100)]
DatePicker A11Y fix time announced for date widgets
* introduced a new method (getFormattedCurrentDate) which formats
the date for all DatePickerDelegates
* implemented (moved) onPopulateAccessibilityEvent in the
AbstractDatePickerDelegate thus all announcements for date pickers
use the same format
* note: added FORMAT_SHOW_WEEKDAY to the current format because
I find the information valuable
E.g:
* Before: "Thu Jun 16 11:49:14 GMT+01:00 2016"
* Now: "Thursday, 16 June 2016"
Bug:
29099922
Change-Id: I94447067f10659747ae310f9e07cf3f487c97e05
Ricky Wai [Thu, 16 Jun 2016 10:47:56 +0000 (10:47 +0000)]
Merge \"Merge \\\"Add permission checking on service calls in LockSettingsService\\\" into nyc-dev am:
43f6a45e7e am:
18c57b5cd5\" into nyc-mr1-dev-plus-aosp
am:
fcc785679d
Change-Id: I9d116b86cc17f8fb48db317470fc1c4cf8a6e757
Ricky Wai [Thu, 16 Jun 2016 10:47:53 +0000 (10:47 +0000)]
Merge \\\"Add permission checking on service calls in LockSettingsService\\\" into nyc-dev am:
43f6a45e7e am:
c42f5c4410
am:
95e27c77a4
Change-Id: I261cd65884f81d68a7c20e4653c3f5a5d336e032
Android Build Merger (Role) [Thu, 16 Jun 2016 10:43:33 +0000 (10:43 +0000)]
Merge "Merge \\"Add permission checking on service calls in LockSettingsService\\" into nyc-dev am:
43f6a45e7e am:
18c57b5cd5" into nyc-mr1-dev-plus-aosp
Ricky Wai [Thu, 16 Jun 2016 10:42:58 +0000 (10:42 +0000)]
Merge \\"Add permission checking on service calls in LockSettingsService\\" into nyc-dev am:
43f6a45e7e
am:
18c57b5cd5
Change-Id: I0d8d74bee55f6431a2a61d26d6a54de2d67a33c4
Ricky Wai [Thu, 16 Jun 2016 10:42:56 +0000 (10:42 +0000)]
Merge \\"Add permission checking on service calls in LockSettingsService\\" into nyc-dev am:
43f6a45e7e
am:
c42f5c4410
Change-Id: Ic0d56aafaeb72135fba107616a664f9845bd81f8
Ricky Wai [Thu, 16 Jun 2016 10:39:03 +0000 (10:39 +0000)]
Merge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
am:
43f6a45e7e
Change-Id: If6535443baacec9fc1af2ed376c3ffa25f677103
Ricky Wai [Thu, 16 Jun 2016 10:38:46 +0000 (10:38 +0000)]
Merge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
am:
43f6a45e7e
Change-Id: I061297e1cd98535f666141ea7709d97c3b490f60
Bill Yi [Thu, 16 Jun 2016 10:36:16 +0000 (10:36 +0000)]
Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am:
d58da1be76 -s ours am:
cf0bd1675c -s ours\" into nyc-mr1-dev-plus-aosp
am:
8416e044dd -s ours
Change-Id: I4f47eb45618d71fa87bee827a098847bd2742c99
Bill Yi [Thu, 16 Jun 2016 10:36:08 +0000 (10:36 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am:
d58da1be76 -s ours am:
1ddd928abf -s ours
am:
9ba43c837c -s ours
Change-Id: I1ecfc5b0126950593798a4f0dfecd98f089c4fe7
Ricky Wai [Thu, 16 Jun 2016 10:33:22 +0000 (10:33 +0000)]
Merge "Add permission checking on service calls in LockSettingsService" into nyc-dev
Android Build Merger (Role) [Thu, 16 Jun 2016 10:30:29 +0000 (10:30 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
d58da1be76 -s ours am:
cf0bd1675c -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Thu, 16 Jun 2016 10:30:01 +0000 (10:30 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
d58da1be76 -s ours
am:
1ddd928abf -s ours
Change-Id: I130fc02f0118dccfc237edb34f077e92c0dfaa2f
Bill Yi [Thu, 16 Jun 2016 10:30:01 +0000 (10:30 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
d58da1be76 -s ours
am:
cf0bd1675c -s ours
Change-Id: Ie9feffc019d1b9c6ae956596c3f1a367700ee39d
Robin Lee [Thu, 16 Jun 2016 10:26:41 +0000 (10:26 +0000)]
Merge \\\"Move \\\'is already always-on\\\' check into Vpn.java\\\" into nyc-dev am:
3e343ffd91 am:
c9ac672d85
am:
741cea0d89
Change-Id: I245d528bc6653d52de944732fceccb3c1d542c3c
Bill Yi [Thu, 16 Jun 2016 10:26:34 +0000 (10:26 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
d58da1be76 -s ours
Change-Id: I892cb57187ad5229701d24112490ac48182c5319
Bill Yi [Thu, 16 Jun 2016 10:26:32 +0000 (10:26 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
d58da1be76 -s ours
Change-Id: I8f6a3c344ce19bf7dbdf3882e393627ed8029d46
Robin Lee [Thu, 16 Jun 2016 10:21:39 +0000 (10:21 +0000)]
Merge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am:
3e343ffd91
am:
c9ac672d85
Change-Id: I12cdcac2581a062313dfc0c854a184485f5fc718
TreeHugger Robot [Thu, 16 Jun 2016 10:21:18 +0000 (10:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Robin Lee [Thu, 16 Jun 2016 10:18:43 +0000 (10:18 +0000)]
Merge \\\"Move \\\'is already always-on\\\' check into Vpn.java\\\" into nyc-dev am:
3e343ffd91 am:
0e7abd3fba
am:
9434b7cde4
Change-Id: I525ebc4b6c27eff17ff57fac7f664c221cbc2954
Bill Yi [Thu, 16 Jun 2016 10:14:23 +0000 (10:14 +0000)]
Merge \"Merge \\"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am:
65266b99d2 -s ours\\" into nyc-mr1-dev am:
74ab23803c -s ours\" into nyc-mr1-dev-plus-aosp
am:
c02f85f0cd -s ours
Change-Id: I120e278e1d8b8c88a0bfc58d065d7b293b4f1171
Bill Yi [Thu, 16 Jun 2016 10:14:16 +0000 (10:14 +0000)]
Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
c985571e5e -s ours\" into nyc-mr1-dev-plus-aosp
am:
a092dcaa1c -s ours
Change-Id: Id6bc13221408023dd4376f955743bb2415e05c6f
Bill Yi [Thu, 16 Jun 2016 10:14:11 +0000 (10:14 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am:
65266b99d2 -s ours am:
f924f2130f -s ours
am:
7c00e15378 -s ours
Change-Id: I46cf8b8313224c4e4b85a0b02368aa5f9a180395
Robin Lee [Thu, 16 Jun 2016 10:14:06 +0000 (10:14 +0000)]
Merge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am:
3e343ffd91
am:
0e7abd3fba
Change-Id: I897c48083f8e6786182d023c58f9861996c6d25c
Robin Lee [Thu, 16 Jun 2016 10:10:23 +0000 (10:10 +0000)]
Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
am:
3e343ffd91
Change-Id: Id363cef8369d63ce4739089d94139e34ed25f665
Robin Lee [Thu, 16 Jun 2016 10:10:23 +0000 (10:10 +0000)]
Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
am:
3e343ffd91
Change-Id: I6532f2e654cfd9df8ee6c649344b0b915a8381c1
Android Build Merger (Role) [Thu, 16 Jun 2016 10:09:50 +0000 (10:09 +0000)]
Merge "Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
65266b99d2 -s ours\" into nyc-mr1-dev am:
74ab23803c -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 16 Jun 2016 10:09:37 +0000 (10:09 +0000)]
Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am:
c985571e5e -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Thu, 16 Jun 2016 10:09:23 +0000 (10:09 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
5ed24ad6c3 -s ours
am:
206ac49f44 -s ours
Change-Id: If5836f87a9baa954bc0fa72313a7f5e9cf1a74ff
Bill Yi [Thu, 16 Jun 2016 10:09:09 +0000 (10:09 +0000)]
Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
65266b99d2 -s ours\" into nyc-mr1-dev
am:
74ab23803c -s ours
Change-Id: I548d5434c7fcaf9e7d5588f948f7fda21d96c473
Bill Yi [Thu, 16 Jun 2016 10:09:05 +0000 (10:09 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
c985571e5e -s ours
Change-Id: I5ea38f0c7f2ab572ba5adaa6df161136bf782e0d
OSDN Git Service
