OSDN Git Service
Bryce Lee [Wed, 25 Mar 2015 18:16:23 +0000 (11:16 -0700)]
Implement isScreenBrightnessBoosted in BridgePowerManager.
Change-Id: I7da132c7522e5c352e14123f059b900008d94c95
(cherry picked from commit
40a4f4a61fbb2172901eda763bf928ae9b1b5300)
Andrei Kapishnikov [Wed, 25 Mar 2015 16:59:44 +0000 (16:59 +0000)]
Merge "Framework: Introduced new NFC provisioning mime-type application/com.android.managedprovisioning.v2"
Alex Klyubin [Wed, 25 Mar 2015 16:52:44 +0000 (16:52 +0000)]
am
98ff619d: am
d4a2e7c4: am
ff022cb1: Merge "Address pending comments for NetworkSecurityPolicy."
* commit '
98ff619d79dd213b21e0cb468d6432f0b4e153b4':
Address pending comments for NetworkSecurityPolicy.
Bryce Lee [Wed, 25 Mar 2015 16:52:30 +0000 (16:52 +0000)]
am
3309be5e: am
21b7e6de: am
c831b978: Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev
* commit '
3309be5e7bc782d89adaf4abca5f1f81649c655f':
Add isScreenBrightnessBoosted and a broadcast when underlying value changes.
Alex Klyubin [Wed, 25 Mar 2015 16:23:46 +0000 (16:23 +0000)]
am
d4a2e7c4: am
ff022cb1: Merge "Address pending comments for NetworkSecurityPolicy."
* commit '
d4a2e7c4040fdcd114cfa50293504a602bc3b8b4':
Address pending comments for NetworkSecurityPolicy.
Svet Ganov [Wed, 25 Mar 2015 16:19:57 +0000 (16:19 +0000)]
Merge "Properly handle system app permissions."
Alex Klyubin [Wed, 25 Mar 2015 16:18:50 +0000 (16:18 +0000)]
am
ff022cb1: Merge "Address pending comments for NetworkSecurityPolicy."
* commit '
ff022cb1bd70fc4c9f973af5afebf51517bda572':
Address pending comments for NetworkSecurityPolicy.
Bryce Lee [Wed, 25 Mar 2015 16:16:42 +0000 (16:16 +0000)]
am
21b7e6de: am
c831b978: Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev
* commit '
21b7e6de94b1e4d0bbe2f1a13ac19f491ff466ed':
Add isScreenBrightnessBoosted and a broadcast when underlying value changes.
Svet Ganov [Wed, 25 Mar 2015 16:10:09 +0000 (09:10 -0700)]
Properly handle system app permissions.
System apps targeting SDK grater than Lollipop MR1 get runtime
permissions and when a new user is added we update the permissions
for all packages to ensure that the new user gets the runtime
permissions.
Change-Id: Ic7dc5b5a94b034e00d715a60b12f613803524c3b
Bryce Lee [Wed, 25 Mar 2015 16:09:48 +0000 (16:09 +0000)]
am
c831b978: Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev
* commit '
c831b978238d5ed200ca329c540eff00faba77e3':
Add isScreenBrightnessBoosted and a broadcast when underlying value changes.
Bryce Lee [Wed, 25 Mar 2015 16:06:13 +0000 (16:06 +0000)]
Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev
Derek Sollenberger [Wed, 25 Mar 2015 16:01:50 +0000 (16:01 +0000)]
Merge "Update ShadowTesslator to support conics"
Zoltan Szatmary-Ban [Wed, 25 Mar 2015 15:59:45 +0000 (15:59 +0000)]
Merge "Data Usage public API"
Zoltan Szatmary-Ban [Wed, 25 Mar 2015 15:58:31 +0000 (15:58 +0000)]
Merge "Add isActiveAdminWithPolicy to DevicePolicyManagerInternal"
Geoff Mendal [Wed, 25 Mar 2015 15:57:12 +0000 (15:57 +0000)]
am
b0d49833: (-s ours) am
d86a584f: (-s ours) am
9cfd002e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
b0d49833be8a00a8466aeea6a839869371a90425':
Import translations. DO NOT MERGE
Zoltan Szatmary-Ban [Mon, 23 Feb 2015 17:20:20 +0000 (17:20 +0000)]
Data Usage public API
Added new API consisting of android.app.usage.NetworkUsageManager and
android.app.usage.NetworkUsageStats. Through them data usage on a
network interface can be programmatically queried. Both summary and
details are available.
Bug:
19208876
Change-Id: I0e0c4b37ae23ad1e589d4b0c955b93f28ba4333e
Geoff Mendal [Wed, 25 Mar 2015 15:50:43 +0000 (15:50 +0000)]
am
d86a584f: (-s ours) am
9cfd002e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
d86a584f101a5932a8fa2b686ef052e22e004854':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Mar 2015 15:45:39 +0000 (15:45 +0000)]
am
9cfd002e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
9cfd002e06c32789ae57698a2d5ca565d7128a49':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 25 Mar 2015 15:42:10 +0000 (15:42 +0000)]
am
33254486: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
3325448639df3ae629fbb33666c9e6c25d306a28':
Import translations. DO NOT MERGE
Derek Sollenberger [Wed, 25 Mar 2015 15:32:17 +0000 (11:32 -0400)]
Update ShadowTesslator to support conics
bug:
19732872
Change-Id: I8b539ab3677219fa5bb7de7caf0aad9fc47ef7e9
Alex Klyubin [Wed, 25 Mar 2015 15:34:35 +0000 (15:34 +0000)]
Merge "Address pending comments for NetworkSecurityPolicy."
Geoff Mendal [Wed, 25 Mar 2015 15:33:59 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 25 Mar 2015 15:33:47 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Andrei Kapishnikov [Mon, 16 Mar 2015 21:24:04 +0000 (17:24 -0400)]
Framework: Introduced new NFC provisioning mime-type application/com.android.managedprovisioning.v2
Related CL: https://googleplex-android-review.git.corp.google.com/657588
Bug:
19673809
Change-Id: I292f9a5b5c511c9102fb43fe938b0389af7fbc54
Geoff Mendal [Wed, 25 Mar 2015 14:41:57 +0000 (07:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab12136de9a5c22854fa0224f64bb88ad3c5f049
Auto-generated-cl: translation import
Jason Monk [Wed, 25 Mar 2015 14:41:13 +0000 (14:41 +0000)]
am
a644c01d: (-s ours) am
4c1a49fc: am
039013c2: Merge "Sort Bluetooth devices in quick settings by name"
* commit '
a644c01db212601c478f46f6914536fadc6cf8f7':
Sort Bluetooth devices in quick settings by name
Zoltan Szatmary-Ban [Mon, 23 Feb 2015 17:20:20 +0000 (17:20 +0000)]
Add isActiveAdminWithPolicy to DevicePolicyManagerInternal
This method will be used by other system services to decide whether an
app is a profile owner or device owner.
Change-Id: I9577700d03ce2c80c798a60c6c2f480fd1913f43
Geoff Mendal [Wed, 25 Mar 2015 14:33:12 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2577a86f9122987bb941278a290022da1ea61f9d
Auto-generated-cl: translation import
Jason Monk [Wed, 25 Mar 2015 14:31:55 +0000 (14:31 +0000)]
am
4c1a49fc: am
039013c2: Merge "Sort Bluetooth devices in quick settings by name"
* commit '
4c1a49fc53a6e9caacfb6d6a8c4c114c2b9a61a9':
Sort Bluetooth devices in quick settings by name
Derek Sollenberger [Wed, 25 Mar 2015 14:30:50 +0000 (14:30 +0000)]
Merge "Fix DrawFilter's usage in HWUI."
Geoff Mendal [Wed, 25 Mar 2015 14:26:24 +0000 (14:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Jason Monk [Wed, 25 Mar 2015 14:25:10 +0000 (14:25 +0000)]
am
039013c2: Merge "Sort Bluetooth devices in quick settings by name"
* commit '
039013c28ef634ab1b630292cc38fb57f206dffd':
Sort Bluetooth devices in quick settings by name
Geoff Mendal [Wed, 25 Mar 2015 14:24:18 +0000 (07:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7f63dc025e1869ee26115aeb6b90cf17f2a1ccfd
Auto-generated-cl: translation import
Jason Monk [Wed, 25 Mar 2015 14:12:12 +0000 (14:12 +0000)]
Merge "Sort Bluetooth devices in quick settings by name"
Derek Sollenberger [Wed, 25 Mar 2015 14:08:30 +0000 (10:08 -0400)]
Fix DrawFilter's usage in HWUI.
Also add additional compile time checks to ensure that the Java
and Skia APIs remain in sync.
bug:
19890753
Change-Id: I8503cacf2859307e3f480a78603f9f05901b58cc
Gus Prevas [Wed, 25 Mar 2015 13:16:26 +0000 (13:16 +0000)]
am
60b0846f: am
c4d7fc10: am
568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev
* commit '
60b0846fc2be8ba462bcfa535cbaced6c43e532b':
Changes callback to a WeakReference in ActivityContainerCallback.
Geoff Mendal [Wed, 25 Mar 2015 13:09:24 +0000 (13:09 +0000)]
Merge "Import translations. DO NOT MERGE"
Gus Prevas [Wed, 25 Mar 2015 13:08:39 +0000 (13:08 +0000)]
am
c4d7fc10: am
568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev
* commit '
c4d7fc10211e9f08317c94e64ac57447e04af428':
Changes callback to a WeakReference in ActivityContainerCallback.
Gus Prevas [Wed, 25 Mar 2015 13:02:46 +0000 (13:02 +0000)]
am
568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev
* commit '
568356ff9a1deab794d329f8c2e245f5a564a2f3':
Changes callback to a WeakReference in ActivityContainerCallback.
Geoff Mendal [Wed, 25 Mar 2015 12:57:17 +0000 (05:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68596d1af3807e0de2cbba9ebd0e65deda354fa9
Auto-generated-cl: translation import
Geoff Mendal [Wed, 25 Mar 2015 12:56:22 +0000 (12:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Gus Prevas [Wed, 25 Mar 2015 12:55:35 +0000 (12:55 +0000)]
Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev
Geoff Mendal [Wed, 25 Mar 2015 12:44:52 +0000 (05:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f8461cc3c0002086052c65ba0c1ac801198c042
Auto-generated-cl: translation import
Geoff Mendal [Wed, 25 Mar 2015 12:41:29 +0000 (05:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9d36d679d32ee84e90eec1d51515894c36390bc1
Auto-generated-cl: translation import
Florian Salbrechter [Wed, 25 Mar 2015 11:00:55 +0000 (11:00 +0000)]
Fixed wrong documentation for BLUETOOTH_SERVICE.
The documentation was incorrectly stating that getSystemService() would
return a BluetoothAdater for Context.BLUETOOTH_SERVICE. The actual
return type is BluetoothManager.
Flavio Lerda [Wed, 25 Mar 2015 10:15:53 +0000 (10:15 +0000)]
Merge "Fix command for getting signing key fingerprint."
Ryo Hashimoto [Wed, 25 Mar 2015 05:22:19 +0000 (05:22 +0000)]
Merge "Add BugreportStorageProvider"
Youngsang Cho [Wed, 25 Mar 2015 04:47:28 +0000 (04:47 +0000)]
Merge "Make TvInputService skip to dispatch media keys to an overlay view"
Youngsang Cho [Wed, 4 Mar 2015 08:38:54 +0000 (17:38 +0900)]
Make TvInputService skip to dispatch media keys to an overlay view
If media keys are dispatched to an overlay view, it is always consumed
because of fallback logic. Therefore, TvInputService skips to dispatch
media keys to an overlay view in order to return the keys back to
an application.
Bug:
18195249
Change-Id: I1cb4c9de5a73bd741ab64b1b85e9c986a1a92a90
Jinsuk Kim [Wed, 25 Mar 2015 04:34:21 +0000 (04:34 +0000)]
Merge "CEC: Explicitly turn on screen for remote control passthrough"
Svet Ganov [Wed, 25 Mar 2015 03:16:39 +0000 (03:16 +0000)]
Merge "First implementation of the grant/revoke UI"
Svet Ganov [Tue, 24 Mar 2015 23:30:25 +0000 (16:30 -0700)]
First implementation of the grant/revoke UI
Change-Id: Icdb7c822881552b30850697dba709671bf27baa5
Adam Powell [Wed, 25 Mar 2015 02:26:24 +0000 (02:26 +0000)]
Merge "Fix right click to context menu behavior of View."
John Spurlock [Wed, 25 Mar 2015 01:41:18 +0000 (01:41 +0000)]
Merge "Fix typo in KeyguardUpdateMonitor."
John Spurlock [Wed, 25 Mar 2015 01:15:48 +0000 (21:15 -0400)]
Fix typo in KeyguardUpdateMonitor.
Change-Id: Iedb2b2051b1a14ab7cc099614f45a57b745ea19d
Rubin Xu [Wed, 25 Mar 2015 00:41:47 +0000 (00:41 +0000)]
Merge "Fix doc for package checksum in DevicePolicyManager."
Deepanshu Gupta [Wed, 25 Mar 2015 00:30:05 +0000 (00:30 +0000)]
am
e773c20d: am
693236b3: am
c263a07a: am
862f5900: am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
e773c20d43a4a8b7504a91df5dd7cb216b89eaef':
Update JRE for runConfigurations.
Deepanshu Gupta [Wed, 25 Mar 2015 00:29:57 +0000 (00:29 +0000)]
am
73a92bd7: (-s ours) am
83ba89e9: am
3deade59: am
dbb38b30: am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
73a92bd7d12c257735ccfd8bb763f7b3fdbab834':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Wed, 25 Mar 2015 00:29:50 +0000 (00:29 +0000)]
am
e2b85016: am
ce2b74f7: am
e51f5cdc: am
e97079d9: am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
e2b8501695c4ba5712d49313e86a566e95a5b0df':
Fix RoundRect radius.
Deepanshu Gupta [Wed, 25 Mar 2015 00:29:42 +0000 (00:29 +0000)]
am
659413d6: am
5c03cd8a: am
96a67430: am
2b98abde: am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
659413d6a2ccd8c8ade06bc3420ca90def3e3be6':
Use right colors for status bar and nav bar.
Deepanshu Gupta [Wed, 25 Mar 2015 00:29:34 +0000 (00:29 +0000)]
am
eb96b231: am
25557e0a: am
5f0252de: am
6fa9d554: am
0b76cf6f: am
34751c79: Merge "Better shadows." into lmp-dev
* commit '
eb96b231b2755d50db4f931cc11203fd32a90820':
Better shadows.
Deepanshu Gupta [Wed, 25 Mar 2015 00:29:23 +0000 (00:29 +0000)]
am
f0e713a6: am
01f9ad1c: am
2ceb310d: am
5bc625d8: am
a62a18e3: am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
f0e713a67a0b5ea5f146900b3d4e53f6e1481c49':
Fix layoutlib tests.
Jun Mukai [Tue, 24 Mar 2015 01:26:12 +0000 (18:26 -0700)]
Fix right click to context menu behavior of View.
When the View opens the context menu, the mouse-down event is
already handled. Therefore, the next ACTION_UP should be canceled,
otherwise, single right click shows the context menu and then
invokes the normal click actions.
Also, the right-down event should always be consumed regardless
of the context menu support. "the right click opens the context
menu on some views, but it behaves as a normal click on some
other views" would confuse users.
Bug:
19641497
Change-Id: Ibbc18fe641745cf42382129b81858d8f3d14768b
Deepanshu Gupta [Wed, 25 Mar 2015 00:22:57 +0000 (00:22 +0000)]
am
693236b3: am
c263a07a: am
862f5900: am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
693236b367050f40b02ab22991d30eb260ec53ea':
Update JRE for runConfigurations.
Deepanshu Gupta [Wed, 25 Mar 2015 00:22:54 +0000 (00:22 +0000)]
am
83ba89e9: am
3deade59: am
dbb38b30: am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
83ba89e94a0ae81875d62666cc67e9f5a357d7ea':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Wed, 25 Mar 2015 00:22:50 +0000 (00:22 +0000)]
am
ce2b74f7: am
e51f5cdc: am
e97079d9: am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
ce2b74f729ea79b86a69cd3f8dd505aa93d0025b':
Fix RoundRect radius.
Deepanshu Gupta [Wed, 25 Mar 2015 00:22:46 +0000 (00:22 +0000)]
am
5c03cd8a: am
96a67430: am
2b98abde: am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
5c03cd8aadcfbf118405bfa5fb2fb95b5561da04':
Use right colors for status bar and nav bar.
Deepanshu Gupta [Wed, 25 Mar 2015 00:22:41 +0000 (00:22 +0000)]
am
25557e0a: am
5f0252de: am
6fa9d554: am
0b76cf6f: am
34751c79: Merge "Better shadows." into lmp-dev
* commit '
25557e0a96c3987c35405fbec56c561ceeb6daf0':
Better shadows.
Deepanshu Gupta [Wed, 25 Mar 2015 00:22:37 +0000 (00:22 +0000)]
am
01f9ad1c: am
2ceb310d: am
5bc625d8: am
a62a18e3: am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
01f9ad1c671f0b14554ce6ccec10f34e86a49a2a':
Fix layoutlib tests.
Deepanshu Gupta [Wed, 25 Mar 2015 00:15:44 +0000 (00:15 +0000)]
am
c263a07a: am
862f5900: am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
c263a07a55a9806147304a1420ceec2d27a6b49d':
Update JRE for runConfigurations.
Deepanshu Gupta [Wed, 25 Mar 2015 00:15:39 +0000 (00:15 +0000)]
am
3deade59: am
dbb38b30: am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
3deade5981372fc44e83c161c7d0dbb9df529e3f':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Wed, 25 Mar 2015 00:15:33 +0000 (00:15 +0000)]
am
e51f5cdc: am
e97079d9: am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
e51f5cdcf34fe127792a177a3953dad03ef23647':
Fix RoundRect radius.
Deepanshu Gupta [Wed, 25 Mar 2015 00:15:28 +0000 (00:15 +0000)]
am
96a67430: am
2b98abde: am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
96a67430c0088168f21b230c64c348a53e672538':
Use right colors for status bar and nav bar.
Deepanshu Gupta [Wed, 25 Mar 2015 00:15:22 +0000 (00:15 +0000)]
am
5f0252de: am
6fa9d554: am
0b76cf6f: am
34751c79: Merge "Better shadows." into lmp-dev
* commit '
5f0252dee43a1cd0f1591b3c9bea2d47ad1f3df0':
Better shadows.
Deepanshu Gupta [Wed, 25 Mar 2015 00:15:14 +0000 (00:15 +0000)]
am
2ceb310d: am
5bc625d8: am
a62a18e3: am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
2ceb310d09a865c56145ba8b5d643a11a7ad2ce5':
Fix layoutlib tests.
Deepanshu Gupta [Wed, 25 Mar 2015 00:09:01 +0000 (00:09 +0000)]
am
862f5900: am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
862f5900e8abce1cc20979a4dca76e1f0b982880':
Update JRE for runConfigurations.
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:54 +0000 (00:08 +0000)]
am
dbb38b30: am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
dbb38b30612dc054ba3bf066f8528cccfceb47ad':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:47 +0000 (00:08 +0000)]
am
e97079d9: am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
e97079d97a5c914d06c24cb9deda1da9bea88aeb':
Fix RoundRect radius.
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:41 +0000 (00:08 +0000)]
am
2b98abde: am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
2b98abde26aa2033562b48d635d6f2ba11c48908':
Use right colors for status bar and nav bar.
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:35 +0000 (00:08 +0000)]
am
6fa9d554: am
0b76cf6f: am
34751c79: Merge "Better shadows." into lmp-dev
* commit '
6fa9d5546fa27665de3f64564897a77735b2a1b0':
Better shadows.
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:28 +0000 (00:08 +0000)]
am
5bc625d8: am
a62a18e3: am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
5bc625d83d60fbb27ab2297051971be91fb3e415':
Fix layoutlib tests.
Deepanshu Gupta [Wed, 25 Mar 2015 00:02:18 +0000 (00:02 +0000)]
am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
44b5a1c8471ef5e1cd3dcfffec5a9e439f228766':
Update JRE for runConfigurations.
Deepanshu Gupta [Wed, 25 Mar 2015 00:02:06 +0000 (00:02 +0000)]
am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
cbb4ec78675c8179cdedafba1972ac062844c70a':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:58 +0000 (00:01 +0000)]
am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
a16bb347e120ba17e87f33ff0364380211d01baf':
Fix RoundRect radius.
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:53 +0000 (00:01 +0000)]
am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
8f9ebc65939ed3ac2e7fdc135e8513fd8d65daaf':
Use right colors for status bar and nav bar.
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:49 +0000 (00:01 +0000)]
am
0b76cf6f: am
34751c79: Merge "Better shadows." into lmp-dev
* commit '
0b76cf6ff56c59a04783714d40163576e3081cf1':
Better shadows.
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:43 +0000 (00:01 +0000)]
am
a62a18e3: am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
a62a18e341180ccf6f5379a7d753584f6cee2e7c':
Fix layoutlib tests.
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:18 +0000 (23:55 +0000)]
am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
e541f35055709ec43407649b8517639ff00e42d6':
Update JRE for runConfigurations.
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:14 +0000 (23:55 +0000)]
am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
6f5fac817abee63d9211e8e43646196950c43707':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:10 +0000 (23:55 +0000)]
am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
44fea60376e4e851b07eb365fd581c5b9404611f':
Fix RoundRect radius.
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:06 +0000 (23:55 +0000)]
am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
3bd5cbb1f3d837d7799fb4b33b4dda99adbeeeb4':
Use right colors for status bar and nav bar.
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:02 +0000 (23:55 +0000)]
am
34751c79: Merge "Better shadows." into lmp-dev
* commit '
34751c79d6696054b19b5fd0e2946c1dbe5bd9bd':
Better shadows.
Deepanshu Gupta [Tue, 24 Mar 2015 23:54:58 +0000 (23:54 +0000)]
am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
311a0f54ac95a1649474498748fff8327b0c917d':
Fix layoutlib tests.
Deepanshu Gupta [Tue, 24 Mar 2015 23:52:28 +0000 (23:52 +0000)]
Merge "Update JRE for runConfigurations." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:52:17 +0000 (23:52 +0000)]
Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:48 +0000 (23:51 +0000)]
Merge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:29 +0000 (23:51 +0000)]
Merge "Use right colors for status bar and nav bar." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:10 +0000 (23:51 +0000)]
Merge "Better shadows." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:50:53 +0000 (23:50 +0000)]
Merge "Fix layoutlib tests." into lmp-dev
Svetoslav [Tue, 24 Mar 2015 23:27:13 +0000 (23:27 +0000)]
Merge "Update API"
OSDN Git Service
