OSDN Git Service
Chet Haase [Fri, 12 Sep 2014 17:27:26 +0000 (17:27 +0000)]
am
4e6406cc: am
f23dcf73: Merge "Unfilled shapes should not report themselves as opaque" into lmp-dev
* commit '
4e6406cc011cd68a5a36414654448e358b3c248a':
Unfilled shapes should not report themselves as opaque
Amith Yamasani [Fri, 12 Sep 2014 17:27:23 +0000 (17:27 +0000)]
am
afa30e93: am
c80b482e: Merge "Check for singleUser attribute even for persistent apps" into lmp-dev
* commit '
afa30e9354717544c4b373de59c76c4bc4f48fb7':
Check for singleUser attribute even for persistent apps
Chris Craik [Fri, 12 Sep 2014 17:27:20 +0000 (17:27 +0000)]
am
d9113f3a: am
f1101afa: Merge "Fix null rect parameter for saveLayer / saveLayerAlpha" into lmp-dev
* commit '
d9113f3a9a3abd9be0cd749fab0fbfdb0d6b6c4a':
Fix null rect parameter for saveLayer / saveLayerAlpha
Jorim Jaggi [Fri, 12 Sep 2014 17:27:16 +0000 (17:27 +0000)]
am
d0f4dc6a: am
135f086a: Merge "Add massive logging to investigate blank Keyguard" into lmp-dev
* commit '
d0f4dc6adc02395e6189f28de78b50396cce33fd':
Add massive logging to investigate blank Keyguard
Michael Wright [Fri, 12 Sep 2014 17:27:08 +0000 (17:27 +0000)]
am
570cfa7c: am
44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
* commit '
570cfa7cb912b4c42be35ef4c1e9d576ee6e779e':
Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
George Mount [Fri, 12 Sep 2014 17:27:05 +0000 (17:27 +0000)]
am
ef6d7a99: am
67f38b35: Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev
* commit '
ef6d7a99070e994b2a3a5cd7ced536f03a23cbae':
Fixed empty TransitionSet not notifying listeners.
Amith Yamasani [Fri, 12 Sep 2014 17:27:02 +0000 (17:27 +0000)]
am
dae2efde: am
7c855708: Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev
* commit '
dae2efde9cc93584ba5814c1a5b16b600f24cbd2':
Annotate bindServiceAsUser with SystemApi
Brian Carlstrom [Fri, 12 Sep 2014 17:26:58 +0000 (17:26 +0000)]
am
d5c9ac41: am
93468f7c: Merge "Add zygote preloading of shared libraries" into lmp-dev
* commit '
d5c9ac41afe1d340ccc9e9d8fc4ff9a559934751':
Add zygote preloading of shared libraries
Yigit Boyar [Fri, 12 Sep 2014 17:26:55 +0000 (17:26 +0000)]
am
d6d79564: am
62bd62e4: Merge "Add support for default content description in DecorToolbar" into lmp-dev
* commit '
d6d79564b6ae8fb131efd1483f9983dd08450ed3':
Add support for default content description in DecorToolbar
Alan Viverette [Fri, 12 Sep 2014 17:26:52 +0000 (17:26 +0000)]
am
a067ea50: am
8c7810a4: Merge "Vertically align toolbar child views with similar gravities" into lmp-dev
* commit '
a067ea5048c5e1a8b74f6aa0caf0e1ed29adf456':
Vertically align toolbar child views with similar gravities
Svetoslav [Fri, 12 Sep 2014 17:26:48 +0000 (17:26 +0000)]
am
7b1f9f02: am
59d0713d: Merge "Fix back button behavior and clean up in print preview activity." into lmp-dev
* commit '
7b1f9f02fde4529e56c1e23b54460d8fa28fc15a':
Fix back button behavior and clean up in print preview activity.
Ihab Awad [Fri, 12 Sep 2014 17:26:44 +0000 (17:26 +0000)]
am
5766cf9c: am
0bf3d66d: Merge "Change UI to represent conferenced IMS connections (1/3)" into lmp-dev
* commit '
5766cf9c8e3fde17c873651dd83a170cff1551a2':
Change UI to represent conferenced IMS connections (1/3)
Adam Powell [Fri, 12 Sep 2014 17:26:40 +0000 (17:26 +0000)]
am
99b94671: am
51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev
* commit '
99b94671875134f803189136aa0230a0d2dd098e':
Remove View methods that can't be used safely from the SDK
Craig Mautner [Fri, 12 Sep 2014 17:26:37 +0000 (17:26 +0000)]
am
8c32d40d: am
790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev
* commit '
8c32d40db7b6125f8e7a41acfb959d8edbbc5d77':
If activity is an alias get maxRecents from target
Jeff Davidson [Fri, 12 Sep 2014 17:26:33 +0000 (17:26 +0000)]
am
d53f9aa7: am
1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev
* commit '
d53f9aa71074471deeb663136798bda19cbfcafd':
Update VpnService Javadoc to reflect new UX.
Craig Mautner [Fri, 12 Sep 2014 17:26:29 +0000 (17:26 +0000)]
am
3ea01345: am
7f97f2c3: Merge "Add null check to TaskPersister file list." into lmp-dev
* commit '
3ea01345700e71b132ae7374ebdc478844f5dee6':
Add null check to TaskPersister file list.
Prerepa Viswanadham [Fri, 12 Sep 2014 17:26:25 +0000 (17:26 +0000)]
am
3ea4bc37: am
041299e3: Remove onConnectionCongested callback
* commit '
3ea4bc3775ce55c4295c41865df12c87aeee6a36':
Remove onConnectionCongested callback
Jeff Brown [Fri, 12 Sep 2014 17:26:21 +0000 (17:26 +0000)]
am
a081f977: am
683872af: Merge "Clean entire arg block when setting process name." into lmp-dev
* commit '
a081f977157f34241c93a47b1360d1267b8f61a4':
Clean entire arg block when setting process name.
Svet Ganov [Fri, 12 Sep 2014 17:26:17 +0000 (17:26 +0000)]
am
f0c2201d: am
60d4306b: Merge "Fix edit text error state in the print UI." into lmp-dev
* commit '
f0c2201d85c6c1945ac2e36801bd4d5daad9309d':
Fix edit text error state in the print UI.
George Mount [Fri, 12 Sep 2014 17:26:14 +0000 (17:26 +0000)]
am
2cccde8a: am
4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev
* commit '
2cccde8af0083aa8134415fe63515dacad401f8d':
Fixed: TransitionSet setStartDelay did nothing.
George Mount [Fri, 12 Sep 2014 17:26:09 +0000 (17:26 +0000)]
am
3e3afc57: am
3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev
* commit '
3e3afc576da469474d352598d4ac422aacc1fbd7':
Have Activity Transitions activited by a new window attribute.
George Mount [Fri, 12 Sep 2014 17:26:06 +0000 (17:26 +0000)]
am
6a0c4f33: am
51d20c87: Merge "Allow Path approximation to work with a single point Path." into lmp-dev
* commit '
6a0c4f336a930fd2076c661a5e44dd7ebe2b55e0':
Allow Path approximation to work with a single point Path.
Igor Murashkin [Fri, 12 Sep 2014 17:26:03 +0000 (17:26 +0000)]
am
99f5c635: am
6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev
* commit '
99f5c635622b5e8885a3c9ed61ff951abeeb6e1a':
camera2.legacy: Add aberration, noisereduction, timestamp source keys
Sreeram Ramachandran [Fri, 12 Sep 2014 17:25:59 +0000 (17:25 +0000)]
am
3a70384d: am
8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev
* commit '
3a70384dcb3b7f6196f723ca3537c5668b40f1fe':
Hide mutable VpnService APIs to add/remove IP addresses dynamically.
Andrew Lee [Fri, 12 Sep 2014 17:25:55 +0000 (17:25 +0000)]
am
16c12739: am
a523c405: Merge "API cleanup for RemoteConnection." into lmp-dev
* commit '
16c12739a510fe4fa36dbb253a3f41a2de6da2fa':
API cleanup for RemoteConnection.
Eric Rowe [Fri, 12 Sep 2014 17:25:52 +0000 (17:25 +0000)]
am
f953099a: am
92168d44: Merge "Fix wifi association tests" into lmp-dev
* commit '
f953099af089f3a7cf33ac3689a49d844cc3e32b':
Fix wifi association tests
Anthony Lee [Fri, 12 Sep 2014 17:25:49 +0000 (17:25 +0000)]
am
c3641224: am
12c83b93: Merge "isValidSlotId() and isValidPhoneId() updated to handle negatives." into lmp-dev
* commit '
c364122468d8c32c880a2be452370e85142cc7dd':
isValidSlotId() and isValidPhoneId() updated to handle negatives.
ztenghui [Fri, 12 Sep 2014 17:25:45 +0000 (17:25 +0000)]
am
ef2a5e2b: am
0a64dc71: Merge "Finer tessellation can draw better looking shadows for circles." into lmp-dev
* commit '
ef2a5e2b7e9b9ca89f076765691a99be8875b76c':
Finer tessellation can draw better looking shadows for circles.
vandwalle [Fri, 12 Sep 2014 17:25:37 +0000 (17:25 +0000)]
am
8f10b04d: am
c7fd0da2: Merge "add option to link only same credential configurations" into lmp-dev
* commit '
8f10b04dc1e29655d3614846963faf1a5877434a':
add option to link only same credential configurations
Christopher Tate [Fri, 12 Sep 2014 17:25:34 +0000 (17:25 +0000)]
am
dba64c67: am
e32b2a5d: Merge "Write new wallpaper files from scratch..." into lmp-dev
* commit '
dba64c67a1c1951d168882b9553e8c390c1f3460':
Write new wallpaper files from scratch...
Nancy Chen [Fri, 12 Sep 2014 17:25:31 +0000 (17:25 +0000)]
am
c9affe8f: am
03ee9f82: Merge "Update TelecommManager per API requirements. (1/3)" into lmp-dev
* commit '
c9affe8f057b3c54907e4f58657101429d274841':
Update TelecommManager per API requirements. (1/3)
Chris Craik [Fri, 12 Sep 2014 17:25:27 +0000 (17:25 +0000)]
am
4922a54b: am
e4c0e03b: Merge "Update HWUI paint filter to understand new location of skia bitmap filter preference" into lmp-dev
* commit '
4922a54b995ba35a59f21bcf6c1854935358549f':
Update HWUI paint filter to understand new location of skia bitmap filter preference
Michael Wright [Fri, 12 Sep 2014 17:25:23 +0000 (17:25 +0000)]
am
46424da2: am
54bc6182: Change callback methods from add to register.
* commit '
46424da2b869e8885728cc414e7bf7b37857747e':
Change callback methods from add to register.
Chet Haase [Fri, 12 Sep 2014 17:25:19 +0000 (17:25 +0000)]
am
d8638046: am
05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev
* commit '
d86380465b3b5a4beae4fbe971a6f4f9238b2509':
Make starting window hw-accelerated
Xin Guan [Fri, 12 Sep 2014 17:25:15 +0000 (17:25 +0000)]
am
b93b1551: am
314712e9: Temp enable the log to identify the wake up cause.
* commit '
b93b1551af75daad83829b212a46f008af8ad34b':
Temp enable the log to identify the wake up cause.
Paul Lawrence [Fri, 12 Sep 2014 17:25:11 +0000 (17:25 +0000)]
am
424464c9: am
5f3e819f: Merge "Create correct files in dropbox on encrypted boot" into lmp-dev
* commit '
424464c925fcee745e39628296713f58ff2fda7a':
Create correct files in dropbox on encrypted boot
Robin Lee [Fri, 12 Sep 2014 17:25:07 +0000 (17:25 +0000)]
Robin Lee [Fri, 12 Sep 2014 17:25:04 +0000 (17:25 +0000)]
Marcin Kosiba [Fri, 12 Sep 2014 10:48:46 +0000 (10:48 +0000)]
am
a9b21ffd: am
5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev
* commit '
a9b21ffd559c6c5566da1a1bac5f1b450e63a179':
Don't use reflection when generating the onResourcesLoaded callback.
John Spurlock [Fri, 12 Sep 2014 10:48:42 +0000 (10:48 +0000)]
am
e927f7c9: am
5d77d533: Merge "Doze: Introduce a pulse period function." into lmp-dev
* commit '
e927f7c9e9dcf9d6713c982b89d2e278aa2a9aaa':
Doze: Introduce a pulse period function.
Nancy Chen [Fri, 12 Sep 2014 10:48:38 +0000 (10:48 +0000)]
am
8c613488: am
63a12357: Merge "Make changes to Connection in Telecomm API (1/4)" into lmp-dev
* commit '
8c6134882c0b2adfc8b3de5f8134c6a1474b7b9f':
Make changes to Connection in Telecomm API (1/4)
Alan Viverette [Fri, 12 Sep 2014 10:48:33 +0000 (10:48 +0000)]
am
7bfa761b: am
f871566a: Merge "Enable adjustViewBounds on preference icon so that maxWidth is used" into lmp-dev
* commit '
7bfa761b774789eae10794478c38e2f45559c591':
Enable adjustViewBounds on preference icon so that maxWidth is used
Robin Lee [Fri, 12 Sep 2014 10:48:29 +0000 (10:48 +0000)]
am
d89caf28: am
03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev
* commit '
d89caf283a9d4ef863b8f4d223e25b81f0e787f9':
Add DevicePolicyManager PrivateKey mgmt
RoboErik [Fri, 12 Sep 2014 10:48:25 +0000 (10:48 +0000)]
am
818f0991: am
6bd52db9: Merge "Update text appearance in leanback setup" into lmp-dev
* commit '
818f0991943b47cf50bd4718eb2e40db40c3bb62':
Update text appearance in leanback setup
Vinit Deshpande [Fri, 12 Sep 2014 10:48:20 +0000 (10:48 +0000)]
am
d62b17cb: am
279e0cc4: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
* commit '
d62b17cb969850af77934721778523a1645641ea':
Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
Amith Yamasani [Fri, 12 Sep 2014 10:48:16 +0000 (10:48 +0000)]
Svetoslav [Fri, 12 Sep 2014 10:48:12 +0000 (10:48 +0000)]
am
5d454ae8: am
dd18a7f7: Merge "Windows for accessibility with wrong coords on rotation." into lmp-dev
* commit '
5d454ae8d10da58ec98159d4228eb63cfb436a65':
Windows for accessibility with wrong coords on rotation.
Vineeta Srivastava [Fri, 12 Sep 2014 10:48:07 +0000 (10:48 +0000)]
am
2c5fee70: am
bc067325: Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev
* commit '
2c5fee70ac95d6abaeab04b6745f5e8518974a47':
Send empty flash for some CDMA carriers for 3way call
Matthew Williams [Fri, 12 Sep 2014 10:48:03 +0000 (10:48 +0000)]
am
0d2113fd: am
3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev
* commit '
0d2113fd5e526b0757b689c4e0c235b1f509761c':
Add flag to JobParameters for job expired
Tyler Gunn [Fri, 12 Sep 2014 10:47:58 +0000 (10:47 +0000)]
am
e9f4ae36: am
ba740d4f: Allowing enable/disable of phone accounts. (1/3)
* commit '
e9f4ae366634678ef3921a9fa7ab005423e0533d':
Allowing enable/disable of phone accounts. (1/3)
Nancy Chen [Fri, 12 Sep 2014 10:47:54 +0000 (10:47 +0000)]
am
bdef7fb8: am
48bc7ea4: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev
* commit '
bdef7fb81d51c1df809808432610d41566c6e209':
API changes in GatewayInfo, Response, and PropertyPresentation (1/4)
Jon Larimer [Fri, 12 Sep 2014 10:47:49 +0000 (10:47 +0000)]
am
0adeef3e: am
92d7b9a6: am
9d8da659: am
d65ab587: am
e2b12b1f: am
61c6ff7b: Merge "Fix issue #
16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev
* commit '
0adeef3e71cca1c39be80c94244a32e9e71c0bf1':
Fix issue #
16794553: Duplicate ArrayMap entries in Bundle...
Amith Yamasani [Fri, 12 Sep 2014 10:47:44 +0000 (10:47 +0000)]
am
d4540672: am
30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev
* commit '
d4540672bc2da984bfd5706c48eb8174f4f15fbb':
Apply cross-user restrictions to Shell
ztenghui [Fri, 12 Sep 2014 10:47:39 +0000 (10:47 +0000)]
am
5b06de07: am
8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev
* commit '
5b06de07aad9daeb61998847e3cb3ba44d6323a1':
Bring back the fillAlpha and strokeAlpha.
ztenghui [Fri, 12 Sep 2014 10:47:35 +0000 (10:47 +0000)]
am
57b58b03: am
e1264a88: Merge "Re-triangulate the spot shadow." into lmp-dev
* commit '
57b58b030c8351d703d12484d5d08f9da1a83a5d':
Re-triangulate the spot shadow.
Jean-Michel Trivi [Fri, 12 Sep 2014 10:47:30 +0000 (10:47 +0000)]
am
0c9aa9cf: am
8c57b9e9: Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev
* commit '
0c9aa9cfa655557708fc45b03c150767b6916c96':
More android.media.AudioFormat.Builder javadoc
Alexandra Gherghina [Fri, 12 Sep 2014 10:47:25 +0000 (10:47 +0000)]
am
82f0d91a: am
e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev
* commit '
82f0d91ae27511f586fc7fb02e660e25e3efd3f8':
Bugfix: use the correct user for ContentResolver calls
Przemyslaw Szczepaniak [Fri, 12 Sep 2014 10:47:21 +0000 (10:47 +0000)]
am
def1eade: am
b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev
* commit '
def1eade10caeb9f8f05ddbd63bec4621376b727':
Replace TreeSet with HashSet.
George Mount [Fri, 12 Sep 2014 10:47:16 +0000 (10:47 +0000)]
am
6d0417db: am
1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev
* commit '
6d0417db1341be9256a6bda483faf074200b6b76':
Omit appearing views that have a parent that is also appearing.
Julia Reynolds [Fri, 12 Sep 2014 10:47:12 +0000 (10:47 +0000)]
am
c82b401e: am
086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev
* commit '
c82b401e6e02aba7fd83a354cab7da7614c9fff5':
Allow device owners to update LOCATION_MODE.
Yohei Yukawa [Fri, 12 Sep 2014 10:47:07 +0000 (10:47 +0000)]
am
0fdbbb56: am
293e5007: Merge "Enrich test cases when enabling default IMEs part 3" into lmp-dev
* commit '
0fdbbb568a204e7be9d6fd0889fe366ffd01ace0':
Enrich test cases when enabling default IMEs part 3
Baligh Uddin [Fri, 12 Sep 2014 10:47:03 +0000 (10:47 +0000)]
am
837003f4: (-s ours) am
77522e51: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
837003f48aebb9dd96cb3101c754c6cdc871396b':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Sep 2014 10:46:59 +0000 (10:46 +0000)]
am
a5ebdc74: (-s ours) am
efef3133: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
a5ebdc744ab9a119a54eb20e5799e73b91e33060':
Import translations. DO NOT MERGE
Alexandra Gherghina [Fri, 12 Sep 2014 10:46:55 +0000 (10:46 +0000)]
am
75aeed1c: am
b04106ed: Merge "Remove package level intent forwarding." into lmp-dev
* commit '
75aeed1c77c21e28b2e3548132db0d6027152292':
Remove package level intent forwarding.
Yohei Yukawa [Fri, 12 Sep 2014 10:46:51 +0000 (10:46 +0000)]
am
e48df1a5: am
163c3d9a: Merge "Enrich test cases when enabling default IMEs part 2" into lmp-dev
* commit '
e48df1a5b8c0208661a0bd3adaee23e94db5be7f':
Enrich test cases when enabling default IMEs part 2
Paul Jensen [Fri, 12 Sep 2014 10:46:47 +0000 (10:46 +0000)]
am
765f98cc: am
c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev
* commit '
765f98cce1d64c8b710b13ef89e21fe24efb4b1e':
Flush HTTP socket pools and DNS cache when binding process to a Network.
Paul Jensen [Fri, 12 Sep 2014 10:46:43 +0000 (10:46 +0000)]
am
3d9eb022: am
7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev
* commit '
3d9eb022aea3d491212835443d4fbac80466b7f7':
Make Network.openConnection() share HttpHandlers not OkHttpClients.
Jorim Jaggi [Fri, 12 Sep 2014 10:46:38 +0000 (10:46 +0000)]
am
5148c772: am
840b03de: Merge "Don\'t use layers when fading between public/private layout" into lmp-dev
* commit '
5148c772ddfd64457fa36fa09b01da2116eec8b4':
Don't use layers when fading between public/private layout
Jorim Jaggi [Fri, 12 Sep 2014 10:46:33 +0000 (10:46 +0000)]
am
c0f4567f: am
7a094593: Merge "Fix inconsistent layout param in notification" into lmp-dev
* commit '
c0f4567f4c7886505f50d6c5b0097877ec9fad8e':
Fix inconsistent layout param in notification
Selim Cinek [Fri, 12 Sep 2014 10:46:28 +0000 (10:46 +0000)]
am
baa3f815: am
2b304948: Merge "Fixed a crash when the more card or the dismissview was longpressed" into lmp-dev
* commit '
baa3f8157a1d537d0a6e99cda4f74b8c6ea2708d':
Fixed a crash when the more card or the dismissview was longpressed
Selim Cinek [Fri, 12 Sep 2014 10:46:22 +0000 (10:46 +0000)]
am
a148f057: am
31ffc0d6: Merge "Fixed a bug where the drag down animation was behaving wrong" into lmp-dev
* commit '
a148f057ef45a85313701945508736172e77f206':
Fixed a bug where the drag down animation was behaving wrong
Selim Cinek [Fri, 12 Sep 2014 10:46:16 +0000 (10:46 +0000)]
am
f71a1a16: am
e4de3fbe: Merge "Fixed a bug where the notifications and the clock could jump" into lmp-dev
* commit '
f71a1a16ad332d6c42b2cb11a92b58ba52d9a0e5':
Fixed a bug where the notifications and the clock could jump
Nicolas Prevot [Fri, 12 Sep 2014 10:46:11 +0000 (10:46 +0000)]
am
7e16a563: am
db19c5af: Merge "Fix: always allow getProviderMimeType within the same user." into lmp-dev
* commit '
7e16a563a384cf6f39c56ba3960124b4f49d3af6':
Fix: always allow getProviderMimeType within the same user.
Yohei Yukawa [Fri, 12 Sep 2014 10:46:05 +0000 (10:46 +0000)]
am
decf7f1e: am
92701395: Merge "Enrich test cases when enabling default IMEs" into lmp-dev
* commit '
decf7f1e35e1b37904b61911eb087549614bd657':
Enrich test cases when enabling default IMEs
Derek Tan [Fri, 12 Sep 2014 10:45:59 +0000 (10:45 +0000)]
am
3a230576: am
4c8c7591: Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev
* commit '
3a230576266e75f3fd034d54dec1d85832be297b':
Update the comment in two APIs since we will persist the settings.
Deepanshu Gupta [Fri, 12 Sep 2014 10:45:53 +0000 (10:45 +0000)]
am
2c3cfb90: am
8d89d1e0: Merge "LayoutLib: support font weights." into lmp-dev
* commit '
2c3cfb9014ef5a970d9729073d1febfe7de4ee9e':
LayoutLib: support font weights.
Jean-Michel Trivi [Fri, 12 Sep 2014 10:45:48 +0000 (10:45 +0000)]
am
930795c0: am
a20c82b9: am
e5c53e9d: am
4fa904ab: am
9513f81e: am
24499ba7: am
e1f07060: (-s ours) am
e825f0ee: am
60f22fbf: Do not restore the media button event receiver
* commit '
930795c0d247d25fe7a551248eecba986f449fa0':
Do not restore the media button event receiver
Ricardo Cervera [Fri, 12 Sep 2014 10:45:42 +0000 (10:45 +0000)]
am
37dbbe0d: am
bb79fcb8: am
6c7bc371: am
4232a59b: am
d086db30: Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug:
16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs
* commit '
37dbbe0dd79c59cf86359b5f8603f2d5f5353e30':
cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug:
16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365
Ricardo Cervera [Fri, 12 Sep 2014 10:45:37 +0000 (10:45 +0000)]
am
d7ba3364: am
ce068304: am
4bb4d66c: am
02afa734: am
a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug:
16948533" into klp-modular-docs
* commit '
d7ba3364845de06a02a7ec04616059a115f9495c':
docs: Fixed minor bug in downloads class. Bug:
16948533
Youngsang Cho [Fri, 12 Sep 2014 10:45:32 +0000 (10:45 +0000)]
am
95f093cb: am
4608b9d9: Fix build breakage
* commit '
95f093cbc58a9a0219db95e1bd4bd18a6c45d94a':
Fix build breakage
Terry Heo [Fri, 12 Sep 2014 10:45:29 +0000 (10:45 +0000)]
am
5b915753: am
75cd6c5e: Merge "Add a system API to query hdmi system audio mode" into lmp-dev
* commit '
5b9157534e4df82befa58f2eed00ecfcbd45cd10':
Add a system API to query hdmi system audio mode
Chulwoo Lee [Fri, 12 Sep 2014 10:45:25 +0000 (10:45 +0000)]
am
2e2422ec: am
cacba761: Notify of the update of TvInputInfo
* commit '
2e2422ec812883c50de8153152a7f4ad6c3583db':
Notify of the update of TvInputInfo
Alan Viverette [Fri, 12 Sep 2014 10:45:21 +0000 (10:45 +0000)]
am
d834fa99: am
515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev
* commit '
d834fa998c17b09e23af3bad796e3b1cc3168ada':
Use Calendar day of week rather than Time in SimpleMonthView
Svetoslav Ganov [Fri, 12 Sep 2014 10:45:17 +0000 (10:45 +0000)]
am
96ae7282: am
f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev
* commit '
96ae7282cb86dd1c7291840ab2575c5e740e5aff':
Using the correct package name for ContentResolver
Lajos Molnar [Fri, 12 Sep 2014 10:45:14 +0000 (10:45 +0000)]
am
4032fbdc: am
c4c153a8: MediaCodec.Image: use image.setCrop() in constructor
* commit '
4032fbdc344cd1f64860a8c97462337bdcac2126':
MediaCodec.Image: use image.setCrop() in constructor
Dianne Hackborn [Fri, 12 Sep 2014 10:45:10 +0000 (10:45 +0000)]
am
bc3eadca: am
022cfcda: Merge "Fix issue #
17414533: update batterystats occasionally takes a couple..." into lmp-dev
* commit '
bc3eadca0e61ac17178a8e009ce9e038af5ef89e':
Fix issue #
17414533: update batterystats occasionally takes a couple...
Dianne Hackborn [Fri, 12 Sep 2014 10:45:06 +0000 (10:45 +0000)]
am
26ed2b70: am
b4ee4428: Merge "Fix issue #
17428001: Fix revokeUriPermissions" into lmp-dev
* commit '
26ed2b70de2acc2cae45a96f576b9125007de764':
Fix issue #
17428001: Fix revokeUriPermissions
Lajos Molnar [Fri, 12 Sep 2014 10:45:03 +0000 (10:45 +0000)]
am
f0c11830: am
3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev
* commit '
f0c1183002e8ad7fbea2f3c7d2189ebc5c862780':
add android.util.SizeF.parseSizeF()
Adam Lesinski [Fri, 12 Sep 2014 10:44:58 +0000 (10:44 +0000)]
am
713a0555: am
5acd2166: Merge "Output recent configs in am get-config command" into lmp-dev
* commit '
713a0555def3b366d30d522741f7390f9a746361':
Output recent configs in am get-config command
Alan Viverette [Fri, 12 Sep 2014 10:44:55 +0000 (10:44 +0000)]
am
46751736: am
2a94c34d: Merge "Copy opaque over shape in GradientDrawable copy constructor" into lmp-dev
* commit '
467517362593673580a6f63cdb09b38b6106a760':
Copy opaque over shape in GradientDrawable copy constructor
Alan Viverette [Fri, 12 Sep 2014 10:44:51 +0000 (10:44 +0000)]
am
74361162: am
78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev
* commit '
743611626e7d9325b38baef27a697f11876a2ff6':
Fix docs and nulling behavior for TextView.setCompoundDrawables
Alan Viverette [Fri, 12 Sep 2014 10:44:47 +0000 (10:44 +0000)]
am
70eb8e2e: am
8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev
* commit '
70eb8e2e3052739263126fda059fe0d13271430c':
Make SearchView styles public, remove public Holo styles added in L
Alan Viverette [Fri, 12 Sep 2014 10:44:43 +0000 (10:44 +0000)]
am
69d6f10f: am
38669745: Merge "Only force drawing in RippleDrawable when necessary" into lmp-dev
* commit '
69d6f10f1131756bb6afa1c52cfb083edd4d1a59':
Only force drawing in RippleDrawable when necessary
Chris Craik [Fri, 12 Sep 2014 10:44:39 +0000 (10:44 +0000)]
am
f08fb156: am
093e3412: Merge "Additional layer logging" into lmp-dev
* commit '
f08fb15646a29bebc5594966fbf8ba7f66dc8b8b':
Additional layer logging
Svetoslav [Fri, 12 Sep 2014 10:44:36 +0000 (10:44 +0000)]
am
145a5654: am
a6b5869f: Merge "Fix a crash in print spooler." into lmp-dev
* commit '
145a56543f5aecaf492ad63f6235789388fae7e6':
Fix a crash in print spooler.
Svetoslav [Fri, 12 Sep 2014 10:44:32 +0000 (10:44 +0000)]
am
b2347d2d: am
930f4fe4: Merge "Accessibilty support for the print UI." into lmp-dev
* commit '
b2347d2d14ccb00fcbd45de7c60e180619571a5a':
Accessibilty support for the print UI.
Jeff Sharkey [Fri, 12 Sep 2014 10:44:28 +0000 (10:44 +0000)]
am
a4368b37: am
bed348e3: Merge "Manage mode shouldn\'t block for other providers." into lmp-dev
* commit '
a4368b377ae2ec78a779d6ae46929dab4c00b0bf':
Manage mode shouldn't block for other providers.
Eric Laurent [Fri, 12 Sep 2014 10:44:24 +0000 (10:44 +0000)]
am
c97f1d02: am
0b381432: Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev
* commit '
c97f1d02ee728267e7b452021032d3e6d44fec9b':
AudioEffect JNI: fix queryEffects()
Baligh Uddin [Fri, 12 Sep 2014 10:44:21 +0000 (10:44 +0000)]
am
6cd00e14: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
6cd00e14b27702750f4d28267f932c892db2613d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Sep 2014 10:44:17 +0000 (10:44 +0000)]
am
75794bdc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
75794bdc18439b03b09436f0945507421b86c12c':
Import translations. DO NOT MERGE