git.osdn.net Git - android-x86/frameworks-base.git/log

Alan Viverette [Tue, 29 Sep 2015 16:24:42 +0000 (16:24 +0000)]

Merge "Unhide PopupWindow.getMaxAvailableHeight(View, int, boolean)"

Baligh Uddin [Tue, 29 Sep 2015 15:04:11 +0000 (15:04 +0000)]

am 8c30514c: (-s ours) am d412cc05: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '8c30514c0edd3ba244d842f11e2887d27dceaa95':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 15:04:00 +0000 (15:04 +0000)]

am 981d8118: (-s ours) am 756bd429: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '981d81180e7fada8638253f0b2750ebb04fe434b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 15:03:33 +0000 (15:03 +0000)]

am 9dd38f3f: (-s ours) am 6f2bb3a3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '9dd38f3f12e84399ba3c901ca94569db81a26570':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 15:03:26 +0000 (15:03 +0000)]

am 40359e03: (-s ours) am ae442baf: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '40359e0322822cab3b6a00f3ce30a3cf0e7d7a6f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 15:03:18 +0000 (15:03 +0000)]

am e3e11d6d: (-s ours) am e2c9b91f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit 'e3e11d6dac4b0ac43a9da028d1c0759081cbd425':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:57:48 +0000 (14:57 +0000)]

am d412cc05: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit 'd412cc0584143fa72e044b57c7ea377626a169ee':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:57:42 +0000 (14:57 +0000)]

am 756bd429: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '756bd429bd6cf2d23e7132de09e61953cb7abc47':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:52:06 +0000 (14:52 +0000)]

am 5ca3191a: (-s ours) am 755e95a4: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '5ca3191a30430ffd3b86cee9c044bd93536aa0cb':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:51:59 +0000 (14:51 +0000)]

am 22a0c0e3: (-s ours) am 0fb5f9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '22a0c0e3dc4198acab5828687a306d291288ad25':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:51:52 +0000 (14:51 +0000)]

am 9b552e34: (-s ours) am 0d8e091e: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '9b552e34004747166ad3d0f0789fb54f3a7f3094':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:51:43 +0000 (14:51 +0000)]

am dbb9f370: (-s ours) am 0010f09a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit 'dbb9f370b2ebc5f1f0276fd0af2f4bd93ab25594':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:51:35 +0000 (14:51 +0000)]

am 514650d8: (-s ours) am 67162a22: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '514650d8a6283694e6050b5aca69cd543e1dfa06':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:51:27 +0000 (14:51 +0000)]

am 89176d5d: (-s ours) am 19efc9e5: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '89176d5d00efa49c2a25e6bd2280408fd94d0280':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:51:19 +0000 (14:51 +0000)]

am ab38b8e5: (-s ours) am 42e73a82: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit 'ab38b8e5ea4149dcc8447f90dcaf6d5c250da416':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:50:06 +0000 (14:50 +0000)]

am 6f2bb3a3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '6f2bb3a3c0697cbff6cf3b3ffde0c06cd911b9a9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:49:59 +0000 (14:49 +0000)]

am ae442baf: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit 'ae442bafad49c8fa889b41771b0a8a505a427988':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:49:53 +0000 (14:49 +0000)]

am e2c9b91f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit 'e2c9b91f53dc17ea62f5fa5ac9be1f4fff91203b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:47:24 +0000 (14:47 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:47:22 +0000 (14:47 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:43:06 +0000 (14:43 +0000)]

am 755e95a4: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '755e95a463559475a60c6360768175ec844104ec':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:42:58 +0000 (14:42 +0000)]

am 0fb5f9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '0fb5f9f337292bd7ac4e380be72ffbaf9dccf51b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:42:52 +0000 (14:42 +0000)]

am 0d8e091e: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '0d8e091ee615fd8580d52e238070e26c3b41c594':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:42:45 +0000 (14:42 +0000)]

am 0010f09a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '0010f09a52532244939221392e8bf649cf0794ed':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:42:40 +0000 (14:42 +0000)]

am 67162a22: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '67162a220cd4b7272b8b65f42f633b8a8065d185':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:42:33 +0000 (14:42 +0000)]

am 19efc9e5: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '19efc9e50fd398a06493f841cdae469c0a93bc6d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:42:26 +0000 (14:42 +0000)]

am 42e73a82: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '42e73a82361e8161660e2af9e683edd496c18eeb':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:40:57 +0000 (14:40 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:40:41 +0000 (14:40 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:40:29 +0000 (14:40 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:39:29 +0000 (14:39 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:39:25 +0000 (14:39 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:39:23 +0000 (14:39 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:39:20 +0000 (14:39 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:39:16 +0000 (14:39 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:38:48 +0000 (14:38 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:38:16 +0000 (14:38 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:33:11 +0000 (14:33 +0000)]

am 23de74ae: (-s ours) am b52e5e38: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '23de74aed5d25152b788e063da8f6a2ed19cd222':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:27:45 +0000 (14:27 +0000)]

am b52e5e38: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit 'b52e5e38981639e5d0f84e6fda2c6cb602b0eeac':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 14:16:23 +0000 (14:16 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 10:13:09 +0000 (03:13 -0700)]

Import translations. DO NOT MERGE

Change-Id: I183c668c3c25901599a969206c5b8e0026ae3d4c
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 10:09:05 +0000 (03:09 -0700)]

Import translations. DO NOT MERGE

Change-Id: I46139a756e32aa01a2e2a1e707d313a309dc7ed0
Auto-generated-cl: translation import

commit | commitdiff | tree

Nicolas Prévot [Tue, 29 Sep 2015 10:00:56 +0000 (10:00 +0000)]

Merge "Add more methods that take a userId to PackageManager."

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 08:57:43 +0000 (01:57 -0700)]

Import translations. DO NOT MERGE

Change-Id: I26c007f30d5540638e8519f09051088d55b7dcd7
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 08:55:45 +0000 (01:55 -0700)]

Import translations. DO NOT MERGE

Change-Id: I7b78a94809c16f73faaf44c1998e08165ff2014e
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 08:46:59 +0000 (01:46 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ibc1f9d45ae3e029f0a2e7801f1c754c0d81a911b
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 08:45:05 +0000 (01:45 -0700)]

Import translations. DO NOT MERGE

Change-Id: I99d39e62622079d2e0dcfd2b739aded1ef286352
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 08:42:59 +0000 (01:42 -0700)]

Import translations. DO NOT MERGE

Change-Id: I3486557152d39d80058d08ce50ae4eb09764a009
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 08:37:52 +0000 (01:37 -0700)]

Import translations. DO NOT MERGE

Change-Id: I2cdd44b0019090f2f4dbe355901e8ad8ffef626e
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 08:35:38 +0000 (01:35 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ia575dec5643f0e64e9c95ac8a9e9d0ef717b6c46
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 08:33:36 +0000 (01:33 -0700)]

Import translations. DO NOT MERGE

Change-Id: I55491102910a9032fe4bfaec05916a2e627c7b86
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 08:31:39 +0000 (01:31 -0700)]

Import translations. DO NOT MERGE

Change-Id: I4792c6e15e22c63197f7c73ea05db41ce896f561
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 08:29:36 +0000 (01:29 -0700)]

Import translations. DO NOT MERGE

Change-Id: I72e15159d79d575b98af928b6d79b5ecd2cf03d1
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 29 Sep 2015 08:27:34 +0000 (01:27 -0700)]

Import translations. DO NOT MERGE

Change-Id: I7de2baf9bc397126186b682cd5893629d4a8a33b
Auto-generated-cl: translation import

commit | commitdiff | tree

Chris Tate [Tue, 29 Sep 2015 00:16:51 +0000 (00:16 +0000)]

Merge "Fix symlink handling during backup"

commit | commitdiff | tree

Fyodor Kupolov [Tue, 29 Sep 2015 00:04:45 +0000 (00:04 +0000)]

Merge "Fixed VPN support for restricted profiles in split system user model"

commit | commitdiff | tree

Fyodor Kupolov [Wed, 2 Sep 2015 20:27:21 +0000 (13:27 -0700)]

Fixed VPN support for restricted profiles in split system user model

In a new split system user model, owner of a restricted profile is not limited
to just user0. restrictedProfileParentId field should be used to get an owner.

Bug: 22950929
Change-Id: I928319a9450e543972237a42267eb2404e117c83

commit | commitdiff | tree

Blazej Magnowski [Mon, 28 Sep 2015 23:36:39 +0000 (23:36 +0000)]

Merge "added DirectionClassifier"

commit | commitdiff | tree

Blazej Magnowski [Mon, 28 Sep 2015 23:36:07 +0000 (23:36 +0000)]

Merge "Improved angles variance and added the angles percentage evaluation"

commit | commitdiff | tree

Blazej Magnowski [Mon, 28 Sep 2015 21:00:11 +0000 (14:00 -0700)]

added DirectionClassifier

Change-Id: I7361971b1b8a86eee346a94da9978eb8c33a33eb

commit | commitdiff | tree

Blazej Magnowski [Fri, 25 Sep 2015 23:41:27 +0000 (16:41 -0700)]

Improved angles variance and added the angles percentage evaluation

Change-Id: I312529ea89707d27a7ef1a5ffd6d94427eaf6e8f

commit | commitdiff | tree

Bill Rassieur [Mon, 28 Sep 2015 23:30:29 +0000 (23:30 +0000)]

am 6e78bb42: am 2711eb4c: am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev

* commit '6e78bb42fc8af64f4f2208b48585451793e303c9':
Fix jank: Don't write lockout deadline if not needed

commit | commitdiff | tree

Bill Rassieur [Mon, 28 Sep 2015 23:19:32 +0000 (23:19 +0000)]

am 2711eb4c: am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev

* commit '2711eb4c3950ee0b5776c07957f0af3c31aa1c67':
Fix jank: Don't write lockout deadline if not needed

commit | commitdiff | tree

Bill Rassieur [Mon, 28 Sep 2015 23:15:24 +0000 (23:15 +0000)]

am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev

* commit '3de2d53a75ed66ee3e64412adfb77ff5a729b43a':
Fix jank: Don't write lockout deadline if not needed

commit | commitdiff | tree

Bill Rassieur [Mon, 28 Sep 2015 23:09:10 +0000 (23:09 +0000)]

am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev

* commit 'c25d546050423845c42a5e8cc8e356caa1f4f71a':
Fix jank: Don't write lockout deadline if not needed

commit | commitdiff | tree

Bill Rassieur [Mon, 28 Sep 2015 23:02:46 +0000 (23:02 +0000)]

Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev

commit | commitdiff | tree

Erik Kline [Mon, 28 Sep 2015 22:42:15 +0000 (22:42 +0000)]

Merge "Add an explanation of how IpReachabilityMonitor works"

commit | commitdiff | tree

Wale Ogunwale [Mon, 28 Sep 2015 22:16:22 +0000 (15:16 -0700)]

Allow non-freeform tasks to gain focus when docked stack is up

We were previously limiting the focus task detection to freeform tasks.

Bug: 24365439
Change-Id: I4e9f8560f7e297bf7abe598565892d59db8c2e23

commit | commitdiff | tree

Dan Willemsen [Mon, 28 Sep 2015 21:36:42 +0000 (21:36 +0000)]

am cd72b8be: am f21beb12: am 899110f3: Merge "Add exported include dir for libandroid_runtime"

* commit 'cd72b8be4653841f34a8d757cf27b055f40105bd':
Add exported include dir for libandroid_runtime

commit | commitdiff | tree

Dan Willemsen [Mon, 28 Sep 2015 21:30:46 +0000 (21:30 +0000)]

am f21beb12: am 899110f3: Merge "Add exported include dir for libandroid_runtime"

* commit 'f21beb12f95b311ae20f2b5058252eb386a8b7b8':
Add exported include dir for libandroid_runtime

commit | commitdiff | tree

Dan Willemsen [Mon, 28 Sep 2015 21:23:57 +0000 (21:23 +0000)]

am 899110f3: Merge "Add exported include dir for libandroid_runtime"

* commit '899110f3012eb9ab2056d8ee182d5bdab0ecae19':
Add exported include dir for libandroid_runtime

commit | commitdiff | tree

Dan Willemsen [Mon, 28 Sep 2015 21:14:42 +0000 (21:14 +0000)]

Merge "Add exported include dir for libandroid_runtime"

commit | commitdiff | tree

Filip Gruszczynski [Mon, 28 Sep 2015 21:05:12 +0000 (21:05 +0000)]

Merge "Resizing docked stack by dragging dock divider."

commit | commitdiff | tree

Jorim Jaggi [Mon, 28 Sep 2015 20:57:37 +0000 (13:57 -0700)]

Fix jank: Don't write lockout deadline if not needed

In the longterm, we should move these synchronous writes
off the main thread, but in the short term, avoiding an unnecessary
write is good enough for the main case.

Bug: 24471234
Change-Id: Id996ff29e61410cd077760a06d7868a413ae88da

commit | commitdiff | tree

Filip Gruszczynski [Wed, 23 Sep 2015 22:01:30 +0000 (15:01 -0700)]

Resizing docked stack by dragging dock divider.

Change-Id: Icc9df00446780f8cd81df4654ace07f33346e901

commit | commitdiff | tree

Alan Viverette [Mon, 28 Sep 2015 20:12:18 +0000 (16:12 -0400)]

Unhide PopupWindow.getMaxAvailableHeight(View, int, boolean)

Bug: 24394572
Change-Id: If66fa0178ed0d8c8d78e286a8b928ad88d6e90fa

commit | commitdiff | tree

Julia Reynolds [Mon, 28 Sep 2015 19:21:28 +0000 (19:21 +0000)]

Merge "Allow signature apps to modify notification policies."

commit | commitdiff | tree

Julia Reynolds [Mon, 28 Sep 2015 15:34:48 +0000 (11:34 -0400)]

Allow signature apps to modify notification policies.

Bug: 22977552
Change-Id: Ib2bc3a55a904011218bb3adb19998cc4a0b7e709

commit | commitdiff | tree

Julia Reynolds [Mon, 28 Sep 2015 18:55:41 +0000 (18:55 +0000)]

Merge "Revert "Allow signature apps to modify notification policies.""

commit | commitdiff | tree

Julia Reynolds [Mon, 28 Sep 2015 18:55:28 +0000 (18:55 +0000)]

Revert "Allow signature apps to modify notification policies."

This reverts commit 39a8c353a8f723e5e67bc846f8fa96d580c4abbb.

Change-Id: I9a9a5fcc76202f5d2b3b175e5d5b9361604285d8

commit | commitdiff | tree

Julia Reynolds [Mon, 28 Sep 2015 18:51:48 +0000 (18:51 +0000)]

Merge "Allow signature apps to modify notification policies."

commit | commitdiff | tree

Dimitry Ivanov [Mon, 28 Sep 2015 18:50:28 +0000 (18:50 +0000)]

am 8571397a: am ef9e04b2: am 66f5affb: Merge "Fix bug number for linker related workarounds"

* commit '8571397a0f99fd29b62e19219f1aa2d5b6894b9e':
Fix bug number for linker related workarounds

commit | commitdiff | tree

Julia Reynolds [Mon, 28 Sep 2015 15:34:48 +0000 (11:34 -0400)]

Allow signature apps to modify notification policies.

Bug: 22977552
Change-Id: I7bfd2fe7bcb2e14b9eb7281acbb8a35dbc2ec93e

commit | commitdiff | tree

Todd Kennedy [Mon, 28 Sep 2015 18:47:19 +0000 (11:47 -0700)]

resolved conflicts for b4d41021 to master

Change-Id: Ib413c588ffb7a2b4385d2088e6de782417625037

commit | commitdiff | tree

Dimitry Ivanov [Mon, 28 Sep 2015 18:28:22 +0000 (18:28 +0000)]

am ef9e04b2: am 66f5affb: Merge "Fix bug number for linker related workarounds"

* commit 'ef9e04b21020fd9e0e4be804627dc96e44e3581c':
Fix bug number for linker related workarounds

commit | commitdiff | tree

Todd Kennedy [Mon, 28 Sep 2015 18:28:14 +0000 (18:28 +0000)]

am 92b28f37: resolved conflicts for 4ed21bf0 to stage-aosp-master

* commit '92b28f37de9956c172f779df4cf540abc5b94deb':
Allow using the JIT

commit | commitdiff | tree

Dimitry Ivanov [Mon, 28 Sep 2015 18:23:56 +0000 (18:23 +0000)]

am 66f5affb: Merge "Fix bug number for linker related workarounds"

* commit '66f5affbe41a49bedf35e73b7c7f482db6e2fa7b':
Fix bug number for linker related workarounds

commit | commitdiff | tree

Todd Kennedy [Mon, 28 Sep 2015 18:20:38 +0000 (11:20 -0700)]

resolved conflicts for 4ed21bf0 to stage-aosp-master

Change-Id: I9c8ab83589ee3786c884f34066c1f3d709dc5136

commit | commitdiff | tree

Dimitry Ivanov [Mon, 28 Sep 2015 18:07:40 +0000 (18:07 +0000)]

Merge "Fix bug number for linker related workarounds"

commit | commitdiff | tree

Fyodor Kupolov [Mon, 28 Sep 2015 18:00:40 +0000 (18:00 +0000)]

Merge "Added --restricted option for create-user command"

commit | commitdiff | tree

Billy Lau [Mon, 28 Sep 2015 17:54:33 +0000 (17:54 +0000)]

am 337c069a: am 81451c1c: am cb4bafb4: am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev

* commit '337c069ac897db69f239c1927ddaf9225a7a6fef':
Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE

commit | commitdiff | tree

Makoto Onuki [Mon, 28 Sep 2015 17:53:16 +0000 (17:53 +0000)]

Merge "Fix OwnersTest when run with -e package"

commit | commitdiff | tree

Todd Kennedy [Mon, 28 Sep 2015 17:47:01 +0000 (17:47 +0000)]

Merge "Allow using the JIT"

commit | commitdiff | tree

Billy Lau [Mon, 28 Sep 2015 17:45:40 +0000 (17:45 +0000)]

am 81451c1c: am cb4bafb4: am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev

* commit '81451c1c370c12d8d6125647e81e5ab5b67fab11':
Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE

commit | commitdiff | tree

Billy Lau [Mon, 28 Sep 2015 17:38:08 +0000 (17:38 +0000)]

am cb4bafb4: am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev

* commit 'cb4bafb4c97dc5e73b055ae1c0e4a548068062cd':
Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE

commit | commitdiff | tree

Dmitriy Ivanov [Mon, 28 Sep 2015 17:37:49 +0000 (10:37 -0700)]

Fix bug number for linker related workarounds

Bug: http:/b/24425865
Change-Id: Iba52acc99c8ff548ff875726988600ed230c988e

commit | commitdiff | tree

Billy Lau [Mon, 28 Sep 2015 17:31:48 +0000 (17:31 +0000)]

am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev

* commit '86e153d5f0614c9f3da137fd0b815a398598928b':
Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE

commit | commitdiff | tree

Jae Seo [Mon, 28 Sep 2015 17:31:46 +0000 (17:31 +0000)]

am 42934e65: am 6fb2da65: Merge "docs: fix a wrong link" into mnc-ub-dev

* commit '42934e65f5e8a6d16b43cc37c3fe2c6ad18a933a':
docs: fix a wrong link

commit | commitdiff | tree

Billy Lau [Mon, 28 Sep 2015 17:24:25 +0000 (17:24 +0000)]

am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev

* commit 'f360bbca969f60ee968240d22bc0b1f1e5e17218':
Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE

commit | commitdiff | tree

Jae Seo [Mon, 28 Sep 2015 17:23:48 +0000 (17:23 +0000)]

am 6fb2da65: Merge "docs: fix a wrong link" into mnc-ub-dev

* commit '6fb2da6506b43347b388f9d4e4327767790f237e':
docs: fix a wrong link