Daniel Sandler
|
51ae2297cf
|
am 484b80a4: am 6812b03e: am 7eb5ce03: Merge "Update date format in panel on locale change." into klp-dev
* commit '484b80a4568acb3075217dae01a77f1ce1d59185':
Update date format in panel on locale change.
|
2013-10-02 09:43:13 -07:00 |
|
Baligh Uddin
|
68d742df25
|
am 7e8d9dba: (-s ours) am be69d3f9: (-s ours) am 48cc1dc4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '7e8d9dbaf3168c7e452789137567a6fb4209ff71':
Import translations. DO NOT MERGE
|
2013-10-02 09:43:10 -07:00 |
|
Baligh Uddin
|
fd119a6fb9
|
am bcb3643f: (-s ours) am 63bc5d85: (-s ours) am ab705268: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'bcb3643fcedb9c3db5397cafc6873c858d4096cf':
Import translations. DO NOT MERGE
|
2013-10-02 09:43:06 -07:00 |
|
Baligh Uddin
|
06b5a5a583
|
am fec60dd7: (-s ours) am 2f4ab564: (-s ours) am bf83288b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'fec60dd7ad5c6e187576ad7e7182de996a1d9e4a':
Import translations. DO NOT MERGE
|
2013-10-02 09:43:02 -07:00 |
|
Baligh Uddin
|
0d215d9ceb
|
am 17d4e503: (-s ours) am ae9358ef: (-s ours) am 8e1a4813: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '17d4e5032a95e0b0fbb986ae768e0df57ab3d2f5':
Import translations. DO NOT MERGE
|
2013-10-02 09:42:58 -07:00 |
|
Baligh Uddin
|
ffcf8631dd
|
am de5f6550: (-s ours) am 1d63d580: (-s ours) am 71dfe63f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'de5f6550a2c0262eab1a210165fcfcfef86d7878':
Import translations. DO NOT MERGE
|
2013-10-02 09:42:56 -07:00 |
|
Igor Murashkin
|
e9ac2ef758
|
am 606926ed: am 1b1cb30d: Merge "camera2: Fix CameraMetadata#getKeys" into klp-dev
* commit '606926eddf94745fcf147c1d5643dc2f2071a3ca':
camera2: Fix CameraMetadata#getKeys
|
2013-10-02 09:42:52 -07:00 |
|
Michael Wright
|
f169b5e528
|
am cd479b6e: am 02cefe27: Merge "Move slide to unlock circle up" into klp-dev
* commit 'cd479b6e880f23b7d87665a1b40fcdf758d12fdb':
Move slide to unlock circle up
|
2013-10-02 09:42:48 -07:00 |
|
Daniel Sandler
|
484b80a456
|
am 6812b03e: am 7eb5ce03: Merge "Update date format in panel on locale change." into klp-dev
* commit '6812b03ee313a346c2216f4a2d7a51cf88733b57':
Update date format in panel on locale change.
|
2013-10-02 09:34:39 -07:00 |
|
Baligh Uddin
|
7e8d9dbaf3
|
am be69d3f9: (-s ours) am 48cc1dc4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'be69d3f91e382127820575128b5723fed8f860ff':
Import translations. DO NOT MERGE
|
2013-10-02 09:34:37 -07:00 |
|
Baligh Uddin
|
bcb3643fce
|
am 63bc5d85: (-s ours) am ab705268: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '63bc5d8527cc0200e54a2642a3b55da0f5be170a':
Import translations. DO NOT MERGE
|
2013-10-02 09:34:34 -07:00 |
|
Baligh Uddin
|
fec60dd7ad
|
am 2f4ab564: (-s ours) am bf83288b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2f4ab564e0eae03d315984d98aa09f13c0533403':
Import translations. DO NOT MERGE
|
2013-10-02 09:34:31 -07:00 |
|
Baligh Uddin
|
17d4e5032a
|
am ae9358ef: (-s ours) am 8e1a4813: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ae9358ef5e3a3e016469ebd6b810ab504e4e10dd':
Import translations. DO NOT MERGE
|
2013-10-02 09:34:28 -07:00 |
|
Baligh Uddin
|
de5f6550a2
|
am 1d63d580: (-s ours) am 71dfe63f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '1d63d580f95469fb3a2cd7d92cc69fbf1432d478':
Import translations. DO NOT MERGE
|
2013-10-02 09:34:25 -07:00 |
|
Igor Murashkin
|
606926eddf
|
am 1b1cb30d: Merge "camera2: Fix CameraMetadata#getKeys" into klp-dev
* commit '1b1cb30d8e7aefb5466ca20e593f8d8062d36b81':
camera2: Fix CameraMetadata#getKeys
|
2013-10-02 09:34:22 -07:00 |
|
Michael Wright
|
cd479b6e88
|
am 02cefe27: Merge "Move slide to unlock circle up" into klp-dev
* commit '02cefe27f334c0919983ec62ab7b679696d3b6b8':
Move slide to unlock circle up
|
2013-10-02 09:34:13 -07:00 |
|
Svetoslav
|
2caf51b5bf
|
am 8fd521c7: am 95b1bbfe: Merge "Fix the build" into klp-dev
* commit '8fd521c7447a6f95006adb56cfa60ff49e1befab':
Fix the build
|
2013-10-01 23:11:00 -07:00 |
|
Jeff Brown
|
d09d5f9e4c
|
am 10478213: am 5e65adaf: Merge "Reset insets when inset computer is removed." into klp-dev
* commit '10478213759a486524000c4164e4176437afa2d7':
Reset insets when inset computer is removed.
|
2013-10-01 23:10:56 -07:00 |
|
Dianne Hackborn
|
b8aa12273f
|
am af85c03d: am b9edb3a2: Merge "Fix issue #10971287: Make ACCESS_BATTERY_STATS permission system or signature." into klp-dev
* commit 'af85c03deb3506cebebd1719df4bfb844505fc9d':
Fix issue #10971287: Make ACCESS_BATTERY_STATS permission system or signature.
|
2013-10-01 23:10:53 -07:00 |
|
Jean-Michel Trivi
|
4c9110fcfc
|
am 13715943: am b4c6b241: Merge "Cache RemoteController artwork bitmap size, use it in registration" into klp-dev
* commit '13715943f24760fbeb462dd601a52af410faac20':
Cache RemoteController artwork bitmap size, use it in registration
|
2013-10-01 23:10:49 -07:00 |
|
Jean-Michel Trivi
|
e8e560e061
|
am db0944de: am 60e7f819: Merge "Improve RemoteControlDisplay registration" into klp-dev
* commit 'db0944de128247e7e6016982a14513b04ac5e6f1':
Improve RemoteControlDisplay registration
|
2013-10-01 23:10:46 -07:00 |
|
John Reck
|
a9212864f3
|
am 6fe99af1: am 288180c2: Merge "Avoid accidentally using software layers" into klp-dev
* commit '6fe99af1bdc00471662ea2fdec0317910a7c3e2b':
Avoid accidentally using software layers
|
2013-10-01 23:10:42 -07:00 |
|
Svetoslav
|
8fd521c744
|
am 95b1bbfe: Merge "Fix the build" into klp-dev
* commit '95b1bbfe6c8fe5072d80e027d4b25319ed6f0411':
Fix the build
|
2013-10-01 22:22:00 -07:00 |
|
Jeff Brown
|
1047821375
|
am 5e65adaf: Merge "Reset insets when inset computer is removed." into klp-dev
* commit '5e65adaf4131bb08862fd5eae249a1f713b8ed51':
Reset insets when inset computer is removed.
|
2013-10-01 22:21:55 -07:00 |
|
Dianne Hackborn
|
af85c03deb
|
am b9edb3a2: Merge "Fix issue #10971287: Make ACCESS_BATTERY_STATS permission system or signature." into klp-dev
* commit 'b9edb3a22b3342912bb9eef79aee0bfcb6be1675':
Fix issue #10971287: Make ACCESS_BATTERY_STATS permission system or signature.
|
2013-10-01 22:21:52 -07:00 |
|
Jean-Michel Trivi
|
13715943f2
|
am b4c6b241: Merge "Cache RemoteController artwork bitmap size, use it in registration" into klp-dev
* commit 'b4c6b241fb96e4482dd7c29f5ec54e40aacbbd25':
Cache RemoteController artwork bitmap size, use it in registration
|
2013-10-01 22:21:49 -07:00 |
|
Jean-Michel Trivi
|
db0944de12
|
am 60e7f819: Merge "Improve RemoteControlDisplay registration" into klp-dev
* commit '60e7f8191e75b8029da72f5248d6b4480bc0beac':
Improve RemoteControlDisplay registration
|
2013-10-01 22:21:46 -07:00 |
|
John Reck
|
6fe99af1bd
|
am 288180c2: Merge "Avoid accidentally using software layers" into klp-dev
* commit '288180c24434ba5b0f35e8f22d39b109b46270e2':
Avoid accidentally using software layers
|
2013-10-01 22:21:30 -07:00 |
|
Elliott Hughes
|
badb9b0c3b
|
am 7fce50eb: am ad8ec14f: am 7fb64c6e: Merge "more locale-appropriate screenshot share text"
* commit '7fce50eb7c62f77c77e1890a44075fb3cf979420':
more locale-appropriate screenshot share text
|
2013-10-01 20:59:39 -07:00 |
|
Elliott Hughes
|
3f54de6ba7
|
am 32393fd8: am 591e8ae3: am b4d1ad29: Merge "Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)"
* commit '32393fd82ad699bc4619e4f7ed4387593f3b5539':
Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)
|
2013-10-01 20:59:33 -07:00 |
|
Matthew Williams
|
95906af264
|
Merge commit '0e0f6003' into manualmerge
Conflicts:
services/java/com/android/server/content/SyncManager.java
Change-Id: If4c3275300892934e11faa7a624c1f2486a64c08
|
2013-10-01 20:54:01 -07:00 |
|
Alan Viverette
|
69fdba4c38
|
am ed2cfdbf: am 6f07cc84: Merge "Rebind transient state views when available" into klp-dev
* commit 'ed2cfdbf42203463cffbbc7184d93af6187c60fc':
Rebind transient state views when available
|
2013-10-01 18:50:27 -07:00 |
|
Amith Yamasani
|
a2957bdcca
|
am 32ff8c14: am f55cf7fc: Merge "Adjust padding for keyguard pin entry keys" into klp-dev
* commit '32ff8c14b285bed93a1e8ec65a49debfdd3cbaef':
Adjust padding for keyguard pin entry keys
|
2013-10-01 18:50:24 -07:00 |
|
Robert Greenwalt
|
d29724c640
|
am 2b6b3d9c: am bad5d694: Merge "Use a build-specific wifi country code" into klp-dev
* commit '2b6b3d9c495d3c8332aad6515a1db06e8fde3848':
Use a build-specific wifi country code
|
2013-10-01 18:50:20 -07:00 |
|
Jim Miller
|
7f5348b093
|
am 102f0e05: am 8b3bc51c: Merge "Disable keyguard widgets on low memory devices" into klp-dev
* commit '102f0e05ba1efb76a3f68ae57fbea4dd85fa1ef8':
Disable keyguard widgets on low memory devices
|
2013-10-01 18:50:17 -07:00 |
|
Adam Powell
|
04ac7e4bab
|
am 6d0c46fc: am 81517c86: Merge "Make toast frames a little more opaque" into klp-dev
* commit '6d0c46fc8b5aa064dbb18db9b566bfc8c8eff102':
Make toast frames a little more opaque
|
2013-10-01 18:50:14 -07:00 |
|
Matthew Xie
|
3d2a664a42
|
am 9eb9ebb2: am 0e772b22: Merge "Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields" into klp-dev
* commit '9eb9ebb2fbbe1135919cf685d84eba18cfecdf01':
Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields
|
2013-10-01 18:50:10 -07:00 |
|
Craig Mautner
|
1cbb42dfea
|
am 7d4e6365: am 312ab4bd: Merge "Don\'t display hidden activities over home screen." into klp-dev
* commit '7d4e6365fb87c198ca54fc1d8e979b67d578c28a':
Don't display hidden activities over home screen.
|
2013-10-01 18:50:07 -07:00 |
|
Carlos Valdivia
|
a029cdd4c0
|
am d8d90008: am d6957d5f: Merge "Prevent authenticators from using Settings to launch arbitrary activities." into klp-dev
* commit 'd8d900086a110c5b6d1f6c9b09234e6c84a3e953':
|
2013-10-01 18:50:05 -07:00 |
|
Jake Hamby
|
105ac09f38
|
am 5a8b2c3b: am 65cacb3c: Merge "Add android.provider.Telephony to public API." into klp-dev
* commit '5a8b2c3bc632683e7651132aff3b28e1fc763165':
|
2013-10-01 18:50:01 -07:00 |
|
Daniel Sandler
|
c0054e47d3
|
am 0caebb50: am 026dc143: Merge "Fix configuration changes in status bars." into klp-dev
* commit '0caebb50784939d7c7cba616dbc75c2e516b11f6':
|
2013-10-01 18:49:57 -07:00 |
|
Dianne Hackborn
|
55ed3b8f5c
|
am e2a67ac2: am 57d96f0e: Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev
* commit 'e2a67ac27bb258ee3f28e9651a01632bc9bdf942':
|
2013-10-01 18:49:54 -07:00 |
|
Svetoslav Ganov
|
643bd4ca7c
|
am 8a7d8f97: am 0ed01ab5: Merge "Printers in the list of printers change position." into klp-dev
* commit '8a7d8f97229da8a1cd50977a6d0091ae839ed835':
|
2013-10-01 18:49:50 -07:00 |
|
Craig Mautner
|
2a6cbd9ae9
|
am 92af22f0: am 564e8e6f: Merge "Ensure correct window ordering." into klp-dev
* commit '92af22f0d04c65689f9deee059318226e771182f':
|
2013-10-01 18:49:47 -07:00 |
|
Craig Mautner
|
112be80ff4
|
am 5b291397: am 64ce6b78: Merge "Don\'t kill home process with the rest of its package." into klp-dev
* commit '5b291397e167d552739c7cf717b1a13df32cc90a':
|
2013-10-01 18:49:43 -07:00 |
|
Craig Mautner
|
9ae4cad9d4
|
am 75a3b301: am 5a0c54a5: Merge "Remove home package name methods." into klp-dev
* commit '75a3b301e9035b83c158ef2aef9baf2d5361151d':
|
2013-10-01 18:49:39 -07:00 |
|
Svetoslav
|
68efb78fd3
|
am 82d2d7e4: am c6568719: Merge "Ignore historical printer records for installed services" into klp-dev
* commit '82d2d7e4b073d08b462bdc9c3188f50ced54cc30':
|
2013-10-01 18:49:35 -07:00 |
|
Adam Powell
|
e21a40ea49
|
am cf0a1159: am 43a372f3: Keyguard transport controls: fullscreen art
* commit 'cf0a11594b8126ac79c67ba6c80f2fee720a7cd2':
|
2013-10-01 18:49:31 -07:00 |
|
Jim Miller
|
626b23a2a2
|
am aaee139c: am 1ae85153: Merge "Fix missing transport in keyguard" into klp-dev
* commit 'aaee139cedc440398f937dba0f659d01bf21ebee':
|
2013-10-01 18:49:28 -07:00 |
|
Jim Miller
|
53a781c485
|
am a192253b: am fb2e3c8d: Merge "Fix permissions on WindowManagerService.showAssistant()" into klp-dev
* commit 'a192253bf214ca1e0ea9fc64ab6a4375f9b11882':
|
2013-10-01 18:49:24 -07:00 |
|