OSDN Git Service
Svetoslav Ganov [Wed, 2 Oct 2013 01:49:21 +0000 (18:49 -0700)]
am
b84aa9fe: am
b415525a: Merge "Print job files and print job records not always cleaned up." into klp-dev
* commit '
b84aa9fee339301153f2471c544844510c26637b':
Craig Mautner [Wed, 2 Oct 2013 01:49:17 +0000 (18:49 -0700)]
am
98b96d2c: am
16e6e203: Merge "Centralize handleAppDied and fix return to home." into klp-dev
* commit '
98b96d2c420d24aa9dc65881c6dd87c84baf5f0b':
Adam Lesinski [Wed, 2 Oct 2013 01:49:14 +0000 (18:49 -0700)]
am
4056c94a: am
0c923b7c: Merge "Add badging of Payment apps" into klp-dev
* commit '
4056c94adf97a4cbb3e8dce7caed8508f6524a0d':
Adam Lesinski [Wed, 2 Oct 2013 01:49:10 +0000 (18:49 -0700)]
am
db239f91: am
5223a5ff: Merge "Add support for dumping new badging" into klp-dev
* commit '
db239f91d6641b7cd966464250bed2f2339e9609':
Svetoslav Ganov [Wed, 2 Oct 2013 01:49:07 +0000 (18:49 -0700)]
am
fb83af78: am
c783f673: Merge "Adding a timeout for waiting to get the selected printer\'s capabilities." into klp-dev
* commit '
fb83af78faa94a4dcb0683a420f51245e91da3a5':
Jeff Sharkey [Wed, 2 Oct 2013 01:49:04 +0000 (18:49 -0700)]
am
a2c42861: am
cc637d9a: Merge "New roots UX, async, performance, docs." into klp-dev
* commit '
a2c42861a18b883266da961d8eb2eecb4b95cd72':
Michael Wright [Wed, 2 Oct 2013 01:49:01 +0000 (18:49 -0700)]
am
426700c3: am
edb444b4: Merge "Add missing constructor parameter to KeyEvent" into klp-dev
* commit '
426700c39ff04b3b2a1a9240c070e23e196db802':
Zhijun He [Wed, 2 Oct 2013 01:48:58 +0000 (18:48 -0700)]
am
aa98c43d: am
9552f9b8: Merge "Camera2: remove CameraDevice#getProperties" into klp-dev
* commit '
aa98c43d6855a474d3a9b24b0a269c31b8b95670':
Scott Main [Wed, 2 Oct 2013 01:48:54 +0000 (18:48 -0700)]
am
db173e81: am
3fd40b9a: am
584d4f69: am
57177492: am
4a9999f1: remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
* commit '
db173e81436c5b5f36e810acddf80202ac9cd633':
Amith Yamasani [Wed, 2 Oct 2013 01:48:51 +0000 (18:48 -0700)]
am
a1770e63: am
797df438: am
01c2e173: (-s ours) am
49039929: am
49eb1d95: am
d084cc44: am
4f59a921: am
12fd0f16: am
f6a0c116: am
9bf1a139: am
72c5e376: am
ba1ae3af: am
42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '
a1770e634a9dc1654d1182dfa434a03a2d3e9925':
David Friedman [Wed, 2 Oct 2013 01:48:47 +0000 (18:48 -0700)]
David Friedman [Wed, 2 Oct 2013 01:48:43 +0000 (18:48 -0700)]
am
b2f8ca23: am
6f3193f7: am
f0a5a844: am
165489da: am
2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug:
10641902" into jb-mr2-docs
* commit '
b2f8ca238e62f60fc60f53a28379c1f9ae485c2b':
David Friedman [Wed, 2 Oct 2013 01:48:40 +0000 (18:48 -0700)]
am
63ca3cd3: am
4778aff0: am
ff379fc4: am
707bac2b: am
0b1cfc1f: Merge "Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug:
10797360" into jb-mr2-docs
* commit '
63ca3cd30d0d302c0b50d2afd648dea21e8cd1f8':
David Friedman [Wed, 2 Oct 2013 01:48:36 +0000 (18:48 -0700)]
am
7dd32457: am
d42e4132: am
233a341b: am
1b8e3197: am
8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug:
10807931 10796994" into jb-mr2-docs
* commit '
7dd32457f6ee6b4e62443ee269d487610e5a9253':
David Friedman [Wed, 2 Oct 2013 01:48:32 +0000 (18:48 -0700)]
am
23cd7f42: am
3f54532d: am
657343d7: am
b648f950: am
23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug:
10796099
* commit '
23cd7f4274f0c0a310c94ef7a6fae54e9448c234':
Lajos Molnar [Wed, 2 Oct 2013 01:48:26 +0000 (18:48 -0700)]
am
a5c95f6f: am
974a6e12: Merge "Make SubtitleController thread safe" into klp-dev
* commit '
a5c95f6fe3592dce5275878f76d6fe05d418928e':
Raph Levien [Wed, 2 Oct 2013 01:48:23 +0000 (18:48 -0700)]
am
e5207a41: am
e048f84a: Fix for jank when fast-scrolling DeskClock\'s world cities list in RTL
* commit '
e5207a41c388a304f4e446019b414af86fab168d':
Alan Viverette [Wed, 2 Oct 2013 01:48:20 +0000 (18:48 -0700)]
am
c4ff1f3a: am
015bcd4d: Merge "Add warning about using MergeCursor in CursorAdapter" into klp-dev
* commit '
c4ff1f3ad48472dfb3898b43f91d37607c82ec2c':
Daniel Sandler [Wed, 2 Oct 2013 01:48:16 +0000 (18:48 -0700)]
am
5e833d6f: am
723ad75e: Merge "API cleanups for Notification." into klp-dev
* commit '
5e833d6f57ac25f4f2e95e7cd285e9ff4ef36294':
John Spurlock [Wed, 2 Oct 2013 01:48:13 +0000 (18:48 -0700)]
am
847f4e0e: am
d01a1b04: Merge "Remove unused views when we return to keyguard" into klp-dev
* commit '
847f4e0e1bca36bec207a44ee5b3f3d9f74526f6':
John Spurlock [Wed, 2 Oct 2013 01:48:06 +0000 (18:48 -0700)]
am
7e677440: am
e5b14ee1: Merge "Restore scrim views to former place in view hierarchy." into klp-dev
* commit '
7e6774402e46f1d09c05f1902b37d1589ea3d16e':
Jean Chalard [Wed, 2 Oct 2013 01:48:03 +0000 (18:48 -0700)]
am
db907138: am
5638d29a: Merge "Fix conflicting/unclear documentation in InputConnection." into klp-dev
* commit '
db907138992721e2dbbed5f59d59af76b78ddd97':
Daniel Sandler [Wed, 2 Oct 2013 01:48:00 +0000 (18:48 -0700)]
am
c6f82e9d: am
a9cf1de4: Merge "Would you like a dessert?" into klp-dev
* commit '
c6f82e9d051041994428c9d634ccd8b8d101135e':
Jeff Sharkey [Wed, 2 Oct 2013 01:47:56 +0000 (18:47 -0700)]
am
fa9c7ec0: am
10d65592: Merge "Make directories always enabled, for realz." into klp-dev
* commit '
fa9c7ec0ee31fcb3cd12233e1969f52f1b79cd1d':
Svetoslav [Wed, 2 Oct 2013 01:47:53 +0000 (18:47 -0700)]
am
049e6907: am
25b0151a: Merge "Printers in the list of printers change position." into klp-dev
* commit '
049e69070afe3f7865f45976cdf67e9149a76ee6':
Craig Mautner [Wed, 2 Oct 2013 01:47:49 +0000 (18:47 -0700)]
am
768836b1: am
231bd6c5: Merge "Dismiss keyguard when resuming visible activities" into klp-dev
* commit '
768836b11698f5bfc7a71f5860703710a5b2747c':
Adam Powell [Wed, 2 Oct 2013 01:47:45 +0000 (18:47 -0700)]
am
e7dee824: am
8fb6d97a: Merge "Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu" into klp-dev
* commit '
e7dee824cfd8521a37833d7104026c983a1e7654':
Chet Haase [Wed, 2 Oct 2013 01:47:41 +0000 (18:47 -0700)]
am
be683295: am
033837dd: Merge "Make fading transitions work better" into klp-dev
* commit '
be683295009d1e598e4c2094a55d09c620894b4b':
Raph Levien [Wed, 2 Oct 2013 01:47:36 +0000 (18:47 -0700)]
am
306bda79: am
adf14902: Merge "Fix for Text fading on RTL app names is done at the beginning..." into klp-dev
* commit '
306bda7927d7a837a3cacb145dc6bad84d711ead':
Scott Main [Wed, 2 Oct 2013 01:47:31 +0000 (18:47 -0700)]
am
6d28c456: am
aaf0f83c: am
ef4e5e61: am
194925f9: am
a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
* commit '
6d28c456993f5482705fe111f5b15a961d8f73b9':
Jason Monk [Wed, 2 Oct 2013 01:47:27 +0000 (18:47 -0700)]
am
915015a7: am
da51d36c: Merge "Fix Sending PAC Broadcast before downloaded" into klp-dev
* commit '
915015a797ac6c09f0e2d0a9b508d18f298de7f7':
Jim Miller [Wed, 2 Oct 2013 01:46:20 +0000 (18:46 -0700)]
am
3d4e30ba: am
398d7f61: Merge "Update navbar camera icon and widget background assets in keyguard." into klp-dev
* commit '
3d4e30ba97cb16a6e8fecee40ee54e246f088e3d':
Romain Guy [Wed, 2 Oct 2013 01:46:16 +0000 (18:46 -0700)]
am
c8532ce4: am
33ed738d: Expose View.executeHardwareAction() Bug #
10911502
* commit '
c8532ce4ae91a25b37705b59c6781f9bcecaeae8':
Craig Mautner [Wed, 2 Oct 2013 01:46:13 +0000 (18:46 -0700)]
am
5c60d6b6: am
c449613e: Merge "Revert behavior to perform onResume." into klp-dev
* commit '
5c60d6b657839c45ca6c4cca4d5996c99cbc73d0':
Victoria Lease [Wed, 2 Oct 2013 01:46:09 +0000 (18:46 -0700)]
am
b5f72171: am
a4eb894a: Merge "clarify Paint flag docs" into klp-dev
* commit '
b5f72171fbf83e3e84e7143425eaa1a32863b78f':
Romain Guy [Wed, 2 Oct 2013 01:46:05 +0000 (18:46 -0700)]
am
bb1d4d38: am
d6c1870d: am
5fceada3: Merge "Fragement, or Fragment: that is the question"
* commit '
bb1d4d3896b781905bbf3ccbd5d5617da61cc3eb':
Fragement, or Fragment: that is the question
Carlos Valdivia [Wed, 2 Oct 2013 01:45:47 +0000 (18:45 -0700)]
am
d6957d5f: Merge "Prevent authenticators from using Settings to launch arbitrary activities." into klp-dev
* commit '
d6957d5f8ddf3b542996955bf2d6efe0e9804ef4':
Prevent authenticators from using Settings to launch arbitrary activities.
Jake Hamby [Wed, 2 Oct 2013 01:45:34 +0000 (18:45 -0700)]
am
65cacb3c: Merge "Add android.provider.Telephony to public API." into klp-dev
* commit '
65cacb3c5174f93debd481c7d573f34bc36f80f4':
Add android.provider.Telephony to public API.
Daniel Sandler [Wed, 2 Oct 2013 01:45:25 +0000 (18:45 -0700)]
am
026dc143: Merge "Fix configuration changes in status bars." into klp-dev
* commit '
026dc1432ef70308ef44dafcc28998436e304e75':
Fix configuration changes in status bars.
Dianne Hackborn [Wed, 2 Oct 2013 01:45:11 +0000 (18:45 -0700)]
am
57d96f0e: Merge "Fix issue #
10948509: Crash in procstats when there is no data" into klp-dev
* commit '
57d96f0e92e8af842878660a8271e65cec2426d3':
Fix issue #
10948509: Crash in procstats when there is no data
Svetoslav Ganov [Wed, 2 Oct 2013 01:44:58 +0000 (18:44 -0700)]
am
0ed01ab5: Merge "Printers in the list of printers change position." into klp-dev
* commit '
0ed01ab57f1277a3889da10daa87733c1af6e0d0':
Printers in the list of printers change position.
Craig Mautner [Wed, 2 Oct 2013 01:44:54 +0000 (18:44 -0700)]
am
564e8e6f: Merge "Ensure correct window ordering." into klp-dev
* commit '
564e8e6f548951c9fe5825aaad327b9ffbeece82':
Ensure correct window ordering.
Craig Mautner [Wed, 2 Oct 2013 01:44:50 +0000 (18:44 -0700)]
am
64ce6b78: Merge "Don\'t kill home process with the rest of its package." into klp-dev
* commit '
64ce6b78ccb8522a6147843f4206a5b128571b03':
Don't kill home process with the rest of its package.
Craig Mautner [Wed, 2 Oct 2013 01:44:47 +0000 (18:44 -0700)]
am
5a0c54a5: Merge "Remove home package name methods." into klp-dev
* commit '
5a0c54a5112612777becd7a0f12f74cf720c1b7f':
Remove home package name methods.
Svetoslav [Wed, 2 Oct 2013 01:44:25 +0000 (18:44 -0700)]
am
c6568719: Merge "Ignore historical printer records for installed services" into klp-dev
* commit '
c6568719671206e726f260fad390680f7fb0ee9e':
Ignore historical printer records for installed services
Adam Powell [Wed, 2 Oct 2013 01:44:21 +0000 (18:44 -0700)]
am
43a372f3: Keyguard transport controls: fullscreen art
* commit '
43a372f38ad642f86047e8112e3d43edb7300439':
Keyguard transport controls: fullscreen art
Jim Miller [Wed, 2 Oct 2013 01:44:17 +0000 (18:44 -0700)]
am
1ae85153: Merge "Fix missing transport in keyguard" into klp-dev
* commit '
1ae85153c804553365d18715824fd3a569f8ce18':
Fix missing transport in keyguard
Alan Viverette [Wed, 2 Oct 2013 01:02:38 +0000 (18:02 -0700)]
Fix monochromacy simulation
Change-Id: I1e42218abbb097fd657c200b37b10a734d0b86d4
Jim Miller [Tue, 1 Oct 2013 22:42:45 +0000 (15:42 -0700)]
resolved conflicts for merge of
fb2e3c8d to master
Change-Id: Ic9fe2674e0eb82d071f9b547b6089acacf705576
Victoria Lease [Tue, 1 Oct 2013 21:16:14 +0000 (21:16 +0000)]
Merge "more locale-appropriate screenshot share text"
Alan Viverette [Tue, 1 Oct 2013 18:33:01 +0000 (18:33 +0000)]
Merge "Add accessibility display adjustments"
Fabrice Di Meglio [Tue, 1 Oct 2013 18:10:20 +0000 (18:10 +0000)]
Merge "Update TimePicker widget and its related dialog"
Victoria Lease [Mon, 30 Sep 2013 22:33:43 +0000 (15:33 -0700)]
more locale-appropriate screenshot share text
The SimpleDateFormat version of this produces very poor results in
locales other than en_US. Trusting DateFormat to do its thing
produces more consistently-pleasing results across all locales.
Change-Id: I2eca2b035dfe5282cfc506080db2780bedd15dd4
Mike Lockwood [Tue, 1 Oct 2013 14:09:36 +0000 (14:09 +0000)]
Merge "Supress contents of this project in embedded builds"
Chris Wren [Tue, 1 Oct 2013 13:57:20 +0000 (13:57 +0000)]
Merge "add a test for BackupData helpers."
Svetoslav Ganov [Tue, 1 Oct 2013 02:46:15 +0000 (19:46 -0700)]
am
b415525a: Merge "Print job files and print job records not always cleaned up." into klp-dev
* commit '
b415525a16074b6dc8e295655648b7c7c1074bbb':
Print job files and print job records not always cleaned up.
Craig Mautner [Tue, 1 Oct 2013 02:45:04 +0000 (02:45 +0000)]
Merge "resolved conflicts for merge of
16e6e203 to master"
Baligh Uddin [Tue, 1 Oct 2013 02:44:05 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 1 Oct 2013 02:43:42 +0000 (02:43 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 1 Oct 2013 02:42:42 +0000 (02:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 1 Oct 2013 02:42:04 +0000 (02:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Craig Mautner [Tue, 1 Oct 2013 02:41:20 +0000 (19:41 -0700)]
resolved conflicts for merge of
16e6e203 to master
Change-Id: Id71654464f7b271fdceea047b9549051135f8431
Baligh Uddin [Tue, 1 Oct 2013 02:40:34 +0000 (02:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 1 Oct 2013 02:40:25 +0000 (02:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Svetoslav Ganov [Tue, 1 Oct 2013 00:10:08 +0000 (17:10 -0700)]
am
b415525a: Merge "Print job files and print job records not always cleaned up." into klp-dev
* commit '
b415525a16074b6dc8e295655648b7c7c1074bbb':
Print job files and print job records not always cleaned up.
Craig Mautner [Tue, 1 Oct 2013 00:10:02 +0000 (17:10 -0700)]
am
16e6e203: Merge "Centralize handleAppDied and fix return to home." into klp-dev
* commit '
16e6e203c0c86a1cbc1a7c1cf20cb5447f705a32':
Centralize handleAppDied and fix return to home.
Adam Lesinski [Tue, 1 Oct 2013 00:09:58 +0000 (17:09 -0700)]
am
0c923b7c: Merge "Add badging of Payment apps" into klp-dev
* commit '
0c923b7ce1f4e40b401bcd342f4ee4399f4ad9d7':
Add badging of Payment apps
Adam Lesinski [Tue, 1 Oct 2013 00:09:54 +0000 (17:09 -0700)]
am
5223a5ff: Merge "Add support for dumping new badging" into klp-dev
* commit '
5223a5ff24bed6d0a0ac618083a3ed050bdd98b2':
Add support for dumping new badging
Svetoslav Ganov [Tue, 1 Oct 2013 00:09:51 +0000 (17:09 -0700)]
am
c783f673: Merge "Adding a timeout for waiting to get the selected printer\'s capabilities." into klp-dev
* commit '
c783f6738f0f6d2cb57702cfbc9219c59a3410a3':
Adding a timeout for waiting to get the selected printer's capabilities.
Jeff Sharkey [Tue, 1 Oct 2013 00:09:48 +0000 (17:09 -0700)]
am
cc637d9a: Merge "New roots UX, async, performance, docs." into klp-dev
* commit '
cc637d9ae5920ac2f685090f595dc1e1643d71cc':
New roots UX, async, performance, docs.
Michael Wright [Tue, 1 Oct 2013 00:09:46 +0000 (17:09 -0700)]
am
edb444b4: Merge "Add missing constructor parameter to KeyEvent" into klp-dev
* commit '
edb444b44419def54292cf8325c22697213153fa':
Add missing constructor parameter to KeyEvent
Zhijun He [Tue, 1 Oct 2013 00:09:41 +0000 (17:09 -0700)]
am
9552f9b8: Merge "Camera2: remove CameraDevice#getProperties" into klp-dev
* commit '
9552f9b8c2bc6d671809514cb402cbc48ee2e323':
Camera2: remove CameraDevice#getProperties
Scott Main [Tue, 1 Oct 2013 00:09:23 +0000 (17:09 -0700)]
am
3fd40b9a: am
584d4f69: am
57177492: am
4a9999f1: remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
* commit '
3fd40b9acb49a2953a014ac929db6b6d7ef12f16':
remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
Amith Yamasani [Tue, 1 Oct 2013 00:09:19 +0000 (17:09 -0700)]
am
797df438: am
01c2e173: (-s ours) am
49039929: am
49eb1d95: am
d084cc44: am
4f59a921: am
12fd0f16: am
f6a0c116: am
9bf1a139: am
72c5e376: am
ba1ae3af: am
42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '
797df43849fd79c05f3a56bdc62748c38e7a182c':
Don't instantiate non-Fragments in Fragment.instantiate
David Friedman [Tue, 1 Oct 2013 00:09:16 +0000 (17:09 -0700)]
am
4feebfc4: am
afd85f82: am
c6d085a5: am
37453a83: Merge "Docs: Changed" into jb-mr2-docs
* commit '
4feebfc427803378d7fad0488b238715fbe435ec':
Docs: Changed
David Friedman [Tue, 1 Oct 2013 00:09:13 +0000 (17:09 -0700)]
am
6f3193f7: am
f0a5a844: am
165489da: am
2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug:
10641902" into jb-mr2-docs
* commit '
6f3193f78d8a28c763e136d1d19208e6dcd68270':
Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug:
10641902
David Friedman [Tue, 1 Oct 2013 00:09:11 +0000 (17:09 -0700)]
am
4778aff0: am
ff379fc4: am
707bac2b: am
0b1cfc1f: Merge "Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug:
10797360" into jb-mr2-docs
* commit '
4778aff02fe0df20ee5393fa739beca0b048e5a4':
Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug:
10797360
David Friedman [Tue, 1 Oct 2013 00:09:08 +0000 (17:09 -0700)]
am
d42e4132: am
233a341b: am
1b8e3197: am
8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug:
10807931 10796994" into jb-mr2-docs
* commit '
d42e4132bafe1b7cf6a665b6a0ed3160fe3ac991':
Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug:
10807931 10796994
David Friedman [Tue, 1 Oct 2013 00:09:05 +0000 (17:09 -0700)]
am
3f54532d: am
657343d7: am
b648f950: am
23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug:
10796099
* commit '
3f54532d72d834a41730501f42990c45393b2be1':
Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug:
10796099
Lajos Molnar [Tue, 1 Oct 2013 00:09:03 +0000 (17:09 -0700)]
am
974a6e12: Merge "Make SubtitleController thread safe" into klp-dev
* commit '
974a6e1231f80644e382567c5f0a5fb9b6962d27':
Make SubtitleController thread safe
Raph Levien [Tue, 1 Oct 2013 00:08:48 +0000 (17:08 -0700)]
am
e048f84a: Fix for jank when fast-scrolling DeskClock\'s world cities list in RTL
* commit '
e048f84a762d5f85829ceb2b45de52b73727de74':
Fix for jank when fast-scrolling DeskClock's world cities list in RTL
Alan Viverette [Tue, 1 Oct 2013 00:08:22 +0000 (17:08 -0700)]
am
015bcd4d: Merge "Add warning about using MergeCursor in CursorAdapter" into klp-dev
* commit '
015bcd4dd43b850ef209c64dae9c08ccaef9ea80':
Add warning about using MergeCursor in CursorAdapter
Daniel Sandler [Tue, 1 Oct 2013 00:08:06 +0000 (17:08 -0700)]
am
723ad75e: Merge "API cleanups for Notification." into klp-dev
* commit '
723ad75e107f57dc541dfca600745895e1251974':
API cleanups for Notification.
John Spurlock [Tue, 1 Oct 2013 00:07:53 +0000 (17:07 -0700)]
am
d01a1b04: Merge "Remove unused views when we return to keyguard" into klp-dev
* commit '
d01a1b0473a38bd75555b3138e8e0037fe391d82':
Remove unused views when we return to keyguard
John Spurlock [Tue, 1 Oct 2013 00:07:50 +0000 (17:07 -0700)]
am
e5b14ee1: Merge "Restore scrim views to former place in view hierarchy." into klp-dev
* commit '
e5b14ee1281325dc7e54df3fd820ff4bd830ef3c':
Restore scrim views to former place in view hierarchy.
Jean Chalard [Tue, 1 Oct 2013 00:07:23 +0000 (17:07 -0700)]
am
5638d29a: Merge "Fix conflicting/unclear documentation in InputConnection." into klp-dev
* commit '
5638d29a648ee5722bb88355351c56fde7d6bc93':
Fix conflicting/unclear documentation in InputConnection.
Daniel Sandler [Tue, 1 Oct 2013 00:07:20 +0000 (17:07 -0700)]
am
a9cf1de4: Merge "Would you like a dessert?" into klp-dev
* commit '
a9cf1de470db5910a38f733f4cd089a44d3162c5':
Would you like a dessert?
Jeff Sharkey [Tue, 1 Oct 2013 00:07:17 +0000 (17:07 -0700)]
am
10d65592: Merge "Make directories always enabled, for realz." into klp-dev
* commit '
10d655927c5c10af0561ecc0961f9a9fcbad89f0':
Make directories always enabled, for realz.
Svetoslav [Tue, 1 Oct 2013 00:07:13 +0000 (17:07 -0700)]
am
25b0151a: Merge "Printers in the list of printers change position." into klp-dev
* commit '
25b0151a570ff6fb7a6acd9c788b9c3cc9f76be9':
Printers in the list of printers change position.
Craig Mautner [Tue, 1 Oct 2013 00:07:07 +0000 (17:07 -0700)]
am
231bd6c5: Merge "Dismiss keyguard when resuming visible activities" into klp-dev
* commit '
231bd6c514f15cb0b42a04d4fc7fc9631c743686':
Dismiss keyguard when resuming visible activities
Adam Powell [Tue, 1 Oct 2013 00:07:03 +0000 (17:07 -0700)]
am
8fb6d97a: Merge "Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu" into klp-dev
* commit '
8fb6d97ad5671b4abc1940d8bc56cf7448e45c35':
Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu
Chet Haase [Tue, 1 Oct 2013 00:06:55 +0000 (17:06 -0700)]
am
033837dd: Merge "Make fading transitions work better" into klp-dev
* commit '
033837dd6bf32b33d9a67d340efd167f94bf80cf':
Make fading transitions work better
Raph Levien [Tue, 1 Oct 2013 00:06:29 +0000 (17:06 -0700)]
am
adf14902: Merge "Fix for Text fading on RTL app names is done at the beginning..." into klp-dev
* commit '
adf149029f701464c66cc5cacbbbc649c1319bcd':
Fix for Text fading on RTL app names is done at the beginning...
Scott Main [Tue, 1 Oct 2013 00:06:26 +0000 (17:06 -0700)]
am
aaf0f83c: am
ef4e5e61: am
194925f9: am
a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
* commit '
aaf0f83c69efd004420633fb577443de80eb35d6':
add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
Jason Monk [Tue, 1 Oct 2013 00:06:23 +0000 (17:06 -0700)]
am
da51d36c: Merge "Fix Sending PAC Broadcast before downloaded" into klp-dev
* commit '
da51d36c74f62a1c50f3960919cb74c5da178cd2':
Fix Sending PAC Broadcast before downloaded
Jim Miller [Mon, 30 Sep 2013 23:42:26 +0000 (16:42 -0700)]
am
398d7f61: Merge "Update navbar camera icon and widget background assets in keyguard." into klp-dev
* commit '
398d7f61866baab65e69b9107c36ba32bf824353':
Update navbar camera icon and widget background assets in keyguard.
Romain Guy [Mon, 30 Sep 2013 23:42:19 +0000 (16:42 -0700)]
am
33ed738d: Expose View.executeHardwareAction() Bug #
10911502
* commit '
33ed738d49dce3af5851d0566739e9ed593057a5':
Expose View.executeHardwareAction() Bug #
10911502
Craig Mautner [Mon, 30 Sep 2013 23:42:11 +0000 (16:42 -0700)]
am
c449613e: Merge "Revert behavior to perform onResume." into klp-dev
* commit '
c449613ec6ffed7b4605a6708a3341ab2dd5320f':
Revert behavior to perform onResume.
Victoria Lease [Mon, 30 Sep 2013 23:42:08 +0000 (16:42 -0700)]
am
a4eb894a: Merge "clarify Paint flag docs" into klp-dev
* commit '
a4eb894a55b07eeddb05d47558e6b2838d56af08':
clarify Paint flag docs
Mike Lockwood [Mon, 30 Sep 2013 23:35:37 +0000 (16:35 -0700)]
Supress contents of this project in embedded builds
Change-Id: Ib5c2853f8a20be2cba21cab081a31a327239cfd4
OSDN Git Service
