OSDN Git Service
Evan Charlton [Thu, 2 Oct 2014 23:15:35 +0000 (23:15 +0000)]
am
8f8bffa1: Merge "Add @SystemApi to missing TelecomManager methods" into lmp-dev
* commit '
8f8bffa1f19a5b2cf9c9ac9c5ca37d4473fa1181':
Add @SystemApi to missing TelecomManager methods
Evan Charlton [Thu, 2 Oct 2014 23:05:22 +0000 (23:05 +0000)]
Merge "Add @SystemApi to missing TelecomManager methods" into lmp-dev
Rich Slogar [Thu, 2 Oct 2014 23:02:41 +0000 (23:02 +0000)]
am
66fea477: am
721b3efc: am
46d8d0cd: am
c470faab: docs:ADT 23.0.4 doc updates
* commit '
66fea4771cc7bf3c8bf03ea1b64425f3f9921b28':
docs:ADT 23.0.4 doc updates
Rich Slogar [Thu, 2 Oct 2014 22:57:45 +0000 (22:57 +0000)]
am
721b3efc: am
46d8d0cd: am
c470faab: docs:ADT 23.0.4 doc updates
* commit '
721b3efc205442e255170d0185ae374b5a5ddc50':
docs:ADT 23.0.4 doc updates
Dianne Hackborn [Thu, 2 Oct 2014 22:54:53 +0000 (22:54 +0000)]
am
7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev
* commit '
7a73f2c5aab16e2d4c21fcce9aa8173e87ecfb4f':
SDK only: Update docs to reflect current implementation.
Rich Slogar [Thu, 2 Oct 2014 22:52:49 +0000 (22:52 +0000)]
am
46d8d0cd: am
c470faab: docs:ADT 23.0.4 doc updates
* commit '
46d8d0cdb349ca0a3f6ef199e1cc1dcba4c2d6eb':
docs:ADT 23.0.4 doc updates
Dianne Hackborn [Thu, 2 Oct 2014 22:49:41 +0000 (22:49 +0000)]
Merge "SDK only: Update docs to reflect current implementation." into lmp-dev
Rich Slogar [Thu, 2 Oct 2014 22:47:15 +0000 (22:47 +0000)]
am
c470faab: docs:ADT 23.0.4 doc updates
* commit '
c470faab3ee47b5643ee6b0a97c925c8f0f587fa':
docs:ADT 23.0.4 doc updates
Jason Monk [Thu, 2 Oct 2014 22:42:58 +0000 (22:42 +0000)]
am
51900639: Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev
* commit '
519006395204ba3eab77ae420d20eb70ebb78af5':
Synchronize on all sendProxyBroadcast calls
Jason Monk [Thu, 2 Oct 2014 22:36:45 +0000 (22:36 +0000)]
Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev
Rich Slogar [Thu, 2 Oct 2014 22:13:09 +0000 (15:13 -0700)]
docs:ADT 23.0.4 doc updates
Change-Id: Ibf412802e7c98ed3beff6c61394f1b3962254d9a
Jeff Brown [Thu, 2 Oct 2014 22:09:08 +0000 (22:09 +0000)]
am
ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev
* commit '
ae309489c2b22c6cfcc6701b5dea13c652239ecd':
Fix race in RecognizerService teardown.
Jeff Brown [Thu, 2 Oct 2014 22:04:08 +0000 (22:04 +0000)]
Merge "Fix race in RecognizerService teardown." into lmp-dev
Joe Fernandez [Thu, 2 Oct 2014 22:00:49 +0000 (22:00 +0000)]
am
7def6026: am
285859b1: am
d36dbe09: am
e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
* commit '
7def60268519536083839a7fd0a2ddfd68d75504':
Revert "docs: Update for Android 23.0.4"
Joe Fernandez [Thu, 2 Oct 2014 21:50:09 +0000 (21:50 +0000)]
am
285859b1: am
d36dbe09: am
e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
* commit '
285859b13728c5cfb6124c11212978f8f95cd9de':
Revert "docs: Update for Android 23.0.4"
Baligh Uddin [Thu, 2 Oct 2014 21:42:22 +0000 (21:42 +0000)]
am
9cdde5f8: Merge "Fix a bug with screen brightness during screen off animation." into lmp-dev
* commit '
9cdde5f8348ddd03e1d6eb2c741fb3e761ab66e9':
Fix a bug with screen brightness during screen off animation.
Christopher Tate [Thu, 2 Oct 2014 21:42:18 +0000 (21:42 +0000)]
am
cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev
* commit '
cdf7961f73f7ee313cbcd2f16750228cc57bcb5e':
Tweak wallpaper restore acceptance heuristics
Etan Cohen [Thu, 2 Oct 2014 21:42:15 +0000 (21:42 +0000)]
am
81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev
* commit '
81e3e4724d2c506bf9e920fd253c54a0bbd38706':
Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
Baligh Uddin [Thu, 2 Oct 2014 21:38:24 +0000 (21:38 +0000)]
Merge "Fix a bug with screen brightness during screen off animation." into lmp-dev
Christopher Tate [Thu, 2 Oct 2014 21:32:47 +0000 (21:32 +0000)]
Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev
Joe Fernandez [Thu, 2 Oct 2014 21:32:15 +0000 (21:32 +0000)]
am
d36dbe09: am
e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
* commit '
d36dbe09a18fc7226029e841cb2a856fb83c81f2':
Revert "docs: Update for Android 23.0.4"
Christopher Tate [Thu, 2 Oct 2014 20:39:12 +0000 (13:39 -0700)]
Tweak wallpaper restore acceptance heuristics
We now accept for restore any image that is at least wide enough to
fit the screen, and has a height within a comfortable margin of the
previously stated target.
Bug
17677006
Change-Id: I5937a82ddfbfa0bbb30d568621eb48e4b3533fac
Etan Cohen [Thu, 2 Oct 2014 21:16:28 +0000 (21:16 +0000)]
Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev
Joe Fernandez [Thu, 2 Oct 2014 21:14:59 +0000 (21:14 +0000)]
am
e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
* commit '
e961d0b521bc25caf964258e75fef3d3ea22e4ac':
Revert "docs: Update for Android 23.0.4"
Joe Fernandez [Thu, 2 Oct 2014 21:08:27 +0000 (21:08 +0000)]
Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
Joe Fernandez [Thu, 2 Oct 2014 21:07:49 +0000 (21:07 +0000)]
Revert "docs: Update for Android 23.0.4"
This reverts commit
f34d0e69033165b7a6e9c73b99f4ef6ac36b3896.
Change-Id: I4d521392733f1b028c72d4623d6d69a4c5910bc4
Evan Charlton [Thu, 2 Oct 2014 20:45:27 +0000 (13:45 -0700)]
Add @SystemApi to missing TelecomManager methods
A few methods (which should be exposed) were missing @SystemApi
annotations.
TelecomManager#addNewIncomingCall
TelecomManager#registerPhoneAccount
TelecomManager#unregisterPhoneAccount
Bug:
17786491
Change-Id: Idf318cf6238668762c00ed0913a9c0ccd5bcb884
Matthew Williams [Thu, 2 Oct 2014 20:53:29 +0000 (20:53 +0000)]
am
5c6756fe: Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"
* commit '
5c6756fefb6db0fe468b9d747960a6da344880ad':
Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"
Matthew Williams [Thu, 2 Oct 2014 04:12:28 +0000 (04:12 +0000)]
Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"
This reverts commit
cf2bd348e73e880fe5bfc7a025732d4ec606ff1f.
Reverted because for account removal the AccountManagerService
delegates the sending of LOGIN_ACCOUNTS_CHANGED to the authenticator.
See b/
17511110.
Change-Id: Ic03016af98070b4add5f7a5ec1fdff32ba63298e
Jing Ji [Thu, 2 Oct 2014 20:45:08 +0000 (20:45 +0000)]
am
d5941978: Allow system app to take ownership of built-in permissions
* commit '
d594197868c4a51bb8f8bd62479999debc72bf2a':
Allow system app to take ownership of built-in permissions
Jing Ji [Wed, 1 Oct 2014 18:31:19 +0000 (13:31 -0500)]
Allow system app to take ownership of built-in permissions
Previous commit
bfed9f34c makes the preloaded system app take
precedence over third-party apps when defining permissions, but
it also makes it be able to override android built-in permissions.
Now allow preloaded system app to take the ownership of built-in
permissions instead of overriding it.
Change-Id: I10d588d0284e4316ea4be552fd6191f33e3c725b
Craig Mautner [Thu, 2 Oct 2014 20:18:05 +0000 (20:18 +0000)]
am
9dfad8c7: Merge "Remove misleading error log." into lmp-dev
* commit '
9dfad8c7f01e8a69989d1c44deb8a621216a0d9f':
Remove misleading error log.
Craig Mautner [Thu, 2 Oct 2014 20:13:54 +0000 (20:13 +0000)]
Merge "Remove misleading error log." into lmp-dev
Jeff Brown [Thu, 2 Oct 2014 20:08:05 +0000 (13:08 -0700)]
Fix a bug with screen brightness during screen off animation.
Due to a recent change there was a regression that caused the
screen brightness to be animated down to 0 while the screen
off animation was running. When the brightness was low this
would cause the screen off animation to be cut short.
This change ensures that we take into account the actual screen
state instead of the desired screen state when making screen
brightness decisions in case we are in the middle of a transition.
The darkness came early. The pixel fairies trembled.
Bug:
17718416
Change-Id: Ib4b55d61b359abbc70920e324f08a5db07bdd035
Dianne Hackborn [Thu, 2 Oct 2014 19:42:18 +0000 (12:42 -0700)]
SDK only: Update docs to reflect current implementation.
Change-Id: I498425bb55b157c954af6a2441d8bd9be3871c55
Jason Monk [Thu, 2 Oct 2014 19:39:38 +0000 (15:39 -0400)]
Synchronize on all sendProxyBroadcast calls
To avoid race conditions. Also make mDefaultProxy volatile for
safety.
Bug:
17697364
Change-Id: I8f0abb1a6e1c816f3addc11a69ff794ad767f2cf
Craig Mautner [Thu, 2 Oct 2014 19:24:02 +0000 (12:24 -0700)]
Remove misleading error log.
It's perfectly ok for a secondary display to not have a home stack.
There is no reason to report it.
Related to b/
17677973.
Change-Id: Ia9d52cabb601760d32d2b847dfa0ca4f304e4e2a
Etan Cohen [Thu, 2 Oct 2014 18:06:23 +0000 (11:06 -0700)]
Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
Bug:
17784975
Change-Id: Ic887477fac1d45f547e30ed6e3c1158fb9a3b893
Jeff Brown [Thu, 2 Oct 2014 19:06:50 +0000 (12:06 -0700)]
Fix race in RecognizerService teardown.
Use a WeakReference to refer to the outer class to prevent leaks.
Ensure atomicity of access to the reference.
Bug:
17584947
Change-Id: I7ad7c7793b60fa125e04fc4d803ed905e8a00a95
Ricardo Cervera [Thu, 2 Oct 2014 18:23:46 +0000 (18:23 +0000)]
am
134b62ed: am
e1e0e05a: am
957f45c3: am
680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs
* commit '
134b62ed14b830b467423082036b3222f84f291c':
docs: Provide direct link to Ubuntu troubleshooting.
Ricardo Cervera [Thu, 2 Oct 2014 18:18:30 +0000 (18:18 +0000)]
am
e1e0e05a: am
957f45c3: am
680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs
* commit '
e1e0e05a14ebb87ca1921cf21a98b9fa0067b14e':
docs: Provide direct link to Ubuntu troubleshooting.
Ricardo Cervera [Thu, 2 Oct 2014 18:13:55 +0000 (18:13 +0000)]
am
957f45c3: am
680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs
* commit '
957f45c328c9cbe9d1fb65dab6d342dc28a85954':
docs: Provide direct link to Ubuntu troubleshooting.
Ricardo Cervera [Thu, 2 Oct 2014 18:07:53 +0000 (18:07 +0000)]
am
680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs
* commit '
680092c5987e701043ff0fa0d2c5390e829412c0':
docs: Provide direct link to Ubuntu troubleshooting.
Ricardo Cervera [Thu, 2 Oct 2014 18:04:41 +0000 (18:04 +0000)]
Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs
Rich Slogar [Thu, 2 Oct 2014 18:03:19 +0000 (18:03 +0000)]
am
da5febdc: am
74ce7413: am
b15cd529: am
c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs
* commit '
da5febdcb24fd74feb1341a8b0deb92089388595':
docs: Update for Android 23.0.4
Ricardo Cervera [Thu, 2 Oct 2014 01:32:42 +0000 (18:32 -0700)]
docs: Provide direct link to Ubuntu troubleshooting.
Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be
Rich Slogar [Thu, 2 Oct 2014 17:53:38 +0000 (17:53 +0000)]
am
74ce7413: am
b15cd529: am
c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs
* commit '
74ce7413158607af6be2889d7392c2e904c9c210':
docs: Update for Android 23.0.4
Rich Slogar [Thu, 2 Oct 2014 17:44:43 +0000 (17:44 +0000)]
am
b15cd529: am
c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs
* commit '
b15cd5296675fac00e5517b89fc1263d59fbad65':
docs: Update for Android 23.0.4
Rich Slogar [Thu, 2 Oct 2014 17:38:35 +0000 (17:38 +0000)]
am
c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs
* commit '
c074c3a4074791ae1270e3177e2299f31b9bb5a1':
docs: Update for Android 23.0.4
Rich Slogar [Thu, 2 Oct 2014 17:31:04 +0000 (17:31 +0000)]
Merge "docs: Update for Android 23.0.4" into klp-modular-docs
Rich Slogar [Wed, 1 Oct 2014 18:37:18 +0000 (11:37 -0700)]
docs: Update for Android 23.0.4
Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf
Kenny Guy [Thu, 2 Oct 2014 16:55:35 +0000 (16:55 +0000)]
am
3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev
* commit '
3de09018a9611b1791cc29ed5200b7d9694189a9':
SettingsProvider should use correct cache when redirecting to user 0.
Kenny Guy [Thu, 2 Oct 2014 16:48:56 +0000 (16:48 +0000)]
Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev
Newton Allen [Thu, 2 Oct 2014 16:47:19 +0000 (16:47 +0000)]
am
d84ce32b: Merge "Fix some documentation typos." into lmp-dev
* commit '
d84ce32bd2d7c3cebac15545504f4fec464a6956':
Fix some documentation typos.
Newton Allen [Thu, 2 Oct 2014 16:39:11 +0000 (16:39 +0000)]
Merge "Fix some documentation typos." into lmp-dev
Paul West [Thu, 2 Oct 2014 15:24:13 +0000 (15:24 +0000)]
Merge "[DS] DSDS support for widget view" into lmp-sprout-dev
smain@google.com [Thu, 2 Oct 2014 15:06:06 +0000 (15:06 +0000)]
am
74c2ec36: Merge "fix confusing sentence https://memegen.googleplex.com/
5524829602054144" into lmp-dev
* commit '
74c2ec3644101ce4cc96e11a851daf21bf35e174':
fix confusing sentence https://memegen.googleplex.com/
5524829602054144
smain@google.com [Thu, 2 Oct 2014 15:02:16 +0000 (15:02 +0000)]
Merge "fix confusing sentence https://memegen.googleplex.com/
5524829602054144" into lmp-dev
George Mount [Thu, 2 Oct 2014 14:33:15 +0000 (14:33 +0000)]
am
d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev
* commit '
d982b582d1993288347f771177f6889fe14fb387':
Fix ChangeTransform works only once on a View.
George Mount [Thu, 2 Oct 2014 14:27:18 +0000 (14:27 +0000)]
Merge "Fix ChangeTransform works only once on a View." into lmp-dev
Lorenzo Colitti [Thu, 2 Oct 2014 11:12:26 +0000 (11:12 +0000)]
am
7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev
* commit '
7fe95529e638467b77372dcac0efe51529e3bde1':
Revert the configKey generation algorithm to what it was in K.
Lorenzo Colitti [Thu, 2 Oct 2014 11:05:19 +0000 (11:05 +0000)]
Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:34 +0000 (09:30 +0000)]
am
107e1fb4: am
ae74287e: (-s ours) am
fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
* commit '
107e1fb4b8ec4c16c5a6ed4635cb0acaea8e2b39':
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:31 +0000 (09:30 +0000)]
am
d3adf40e: am
ae4cb17a: (-s ours) am
76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '
d3adf40ee0845844ed132dd0b25ec0102b9bf919':
Resource resolution bug fix. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:28 +0000 (09:30 +0000)]
am
ba526a28: am
d00d2ff2: (-s ours) am
57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit '
ba526a288811bc6520ad9a70d57e7ef774bbb802':
Fix Tests after cherry picks. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:24 +0000 (09:30 +0000)]
am
a9787de3: am
735229c5: (-s ours) am
52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
* commit '
a9787de33c703fbfbb89b02d9d3d5642305084f8':
Update intelliJ copyright profile [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:21 +0000 (09:30 +0000)]
am
75f2f993: am
925abb6d: (-s ours) am
891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
* commit '
75f2f993392a3903d160e7fed81c0b7ff5cf76f1':
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:18 +0000 (09:30 +0000)]
am
473a2708: am
a21ca344: (-s ours) am
a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
* commit '
473a270852c4316f9840f5190b1cdde8db9e1fef':
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:14 +0000 (09:30 +0000)]
am
d24b45c8: am
93bf0696: (-s ours) am
541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
* commit '
d24b45c807aa788bbb25647166d155d0ed385ddf':
Build layoutlib_create tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:11 +0000 (09:30 +0000)]
am
42099d45: am
ddbd9bec: (-s ours) am
2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit '
42099d45c3f39989c9c4ec1a5f67206f9c23342b':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:08 +0000 (09:30 +0000)]
am
b183c181: am
1cbf17f7: (-s ours) am
ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
* commit '
b183c1812b76411161e9f71a313d2f6384ab9162':
Get filename from File faster [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:04 +0000 (09:30 +0000)]
am
9eb0cd12: am
d332ff3e: (-s ours) am
bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
9eb0cd12742bdd6098932eedfd33a0b14f2196c9':
Add testing framework to LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:01 +0000 (09:30 +0000)]
am
82eecaf8: am
c2ffb54f: (-s ours) am
60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
* commit '
82eecaf826ab06c4f3cb0716a009ff0c8ae00711':
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Justin Koh [Thu, 2 Oct 2014 09:29:57 +0000 (09:29 +0000)]
am
f7aac12e: am
bf6f081c: (-s ours) am
37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit '
f7aac12e1bc766a4357ca29d2f248eef265097f8':
DO NOT MERGE Hide the volume panel for watches for now
Andreas Gampe [Thu, 2 Oct 2014 09:29:54 +0000 (09:29 +0000)]
am
c152c7aa: Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev
* commit '
c152c7aad6ece42d101aede8efe9cdb5ea3f5a3c':
Revert "Frameworks/base: Update to preloaded-classes"
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:09 +0000 (08:51 +0000)]
am
ae74287e: (-s ours) am
fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
* commit '
ae74287e036b432ca394cbc497386547b16c17ff':
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:06 +0000 (08:51 +0000)]
am
ae4cb17a: (-s ours) am
76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '
ae4cb17a14d2a66961728d3cbd907cdba3f2f6d6':
Resource resolution bug fix. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:02 +0000 (08:51 +0000)]
am
d00d2ff2: (-s ours) am
57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit '
d00d2ff2079ca4e77173e3389834416494c7900f':
Fix Tests after cherry picks. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:58 +0000 (08:50 +0000)]
am
735229c5: (-s ours) am
52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
* commit '
735229c5a8286f1ecff5cf54d9ce2c06d7f97d51':
Update intelliJ copyright profile [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:54 +0000 (08:50 +0000)]
am
925abb6d: (-s ours) am
891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
* commit '
925abb6d983aef0016b5828349d53cc5a11ebad8':
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:51 +0000 (08:50 +0000)]
am
a21ca344: (-s ours) am
a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
* commit '
a21ca3449457c5a80b5f06ca9a1fe7b17eb33bff':
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:47 +0000 (08:50 +0000)]
am
93bf0696: (-s ours) am
541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
* commit '
93bf0696e74282fea614120f7e26951111150e48':
Build layoutlib_create tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:43 +0000 (08:50 +0000)]
am
ddbd9bec: (-s ours) am
2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit '
ddbd9bec76036fb2ce9f1cd1b7ccb70bd859a1a5':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:38 +0000 (08:50 +0000)]
am
1cbf17f7: (-s ours) am
ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
* commit '
1cbf17f7654d5ddb66ce76e0f50fe7f170726e20':
Get filename from File faster [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:34 +0000 (08:50 +0000)]
am
d332ff3e: (-s ours) am
bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
d332ff3e3f647b9514ecff1f146464fbc1a93372':
Add testing framework to LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:31 +0000 (08:50 +0000)]
am
c2ffb54f: (-s ours) am
60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
* commit '
c2ffb54fe29d5fcbdd866fd304a9e97af825221a':
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Justin Koh [Thu, 2 Oct 2014 08:50:27 +0000 (08:50 +0000)]
am
bf6f081c: (-s ours) am
37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit '
bf6f081cda7360810645cf6bf932687df1cfae00':
DO NOT MERGE Hide the volume panel for watches for now
Andreas Gampe [Thu, 2 Oct 2014 08:45:45 +0000 (08:45 +0000)]
Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev
Andreas Gampe [Thu, 2 Oct 2014 08:42:00 +0000 (08:42 +0000)]
Revert "Frameworks/base: Update to preloaded-classes"
Breaks shamu for unknown reason.
This reverts commit
da3050614fc9dc31d39ff87ae5df0261fb76f93c.
Bug:
17480683
Change-Id: Id10ff18ef6e3acb5eb84196f7e5608add7edeb66
Sreeram Ramachandran [Thu, 2 Oct 2014 06:29:37 +0000 (06:29 +0000)]
am
5aaabc0f: Merge "Send app permissions to netd." into lmp-dev
* commit '
5aaabc0fa66dd755843f040fe634962477107950':
Send app permissions to netd.
Sreeram Ramachandran [Thu, 2 Oct 2014 06:26:26 +0000 (06:26 +0000)]
Merge "Send app permissions to netd." into lmp-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:44:59 +0000 (03:44 +0000)]
am
7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev
* commit '
7b13c4d8ecc517ae64cc5bd14c40eaef29e8281c':
Always resolve enum when resolving resources.
Deepanshu Gupta [Thu, 2 Oct 2014 03:38:44 +0000 (03:38 +0000)]
am
fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
* commit '
fca5e5577f3690b03e783e4208379011aec46d28':
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:24 +0000 (03:34 +0000)]
am
76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '
76aff1f6ab84b8ac9f4a48ae7dff62ece00e1b97':
Resource resolution bug fix. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:19 +0000 (03:34 +0000)]
am
57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit '
579338345721351313d4c3cd2a5114a0d135028d':
Fix Tests after cherry picks. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:14 +0000 (03:34 +0000)]
am
52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
* commit '
52af468b5e0b6daa1906694b37584366d616159f':
Update intelliJ copyright profile [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:10 +0000 (03:34 +0000)]
am
891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
* commit '
891f38d181505406298bb3b922a33e24de6aaf02':
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:06 +0000 (03:34 +0000)]
am
a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
* commit '
a2f088b6775f0cd0a8b7e3b35e16f13de3f67b01':
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:01 +0000 (03:34 +0000)]
am
541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
* commit '
541e6e5d47b928f3cd73f9e8f1da83ff722892c8':
Build layoutlib_create tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:57 +0000 (03:33 +0000)]
am
2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit '
2d77fad26b0fa2203366d08aeccec9b564a70647':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
OSDN Git Service
