OSDN Git Service

android-x86/frameworks-base.git
8 years agoam 3bca28f1: am e97602ac: (-s ours) am 437eb6ce: Merge "Fix: Wrong suggestion popup...
Keisuke Kuroyanagi [Thu, 27 Aug 2015 17:55:46 +0000 (17:55 +0000)]
am 3bca28f1: am e97602ac: (-s ours) am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

* commit '3bca28f1b240606d63a3e22ffe9ac2053b03dcbb':

8 years agoam 1d8debe9: am 9fbb071a: (-s ours) am b0e4a9e8: Merge "Support optional modem restar...
Robert Greenwalt [Thu, 27 Aug 2015 17:55:39 +0000 (17:55 +0000)]
am 1d8debe9: am 9fbb071a: (-s ours) am b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev

* commit '1d8debe9a322d2c64054604043ff503ac83eca1f':

8 years agoam 8ca0a4a5: am edd63864: (-s ours) am 33c619bb: Merge "Fix hotspot brokenness" into...
Jason Monk [Thu, 27 Aug 2015 17:55:31 +0000 (17:55 +0000)]
am 8ca0a4a5: am edd63864: (-s ours) am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev

* commit '8ca0a4a557abd51225f6d2b8539a62e699231b37':

8 years agoam 3be445da: am 9d8d37b4: (-s ours) am 26f7720e: Merge "MediaSession: Do not lock...
Jae Seo [Thu, 27 Aug 2015 17:55:23 +0000 (17:55 +0000)]
am 3be445da: am 9d8d37b4: (-s ours) am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

* commit '3be445da221ae89babe505b4216dccbfa6b520cb':

8 years agoam 85b00533: am 83f5bff6: (-s ours) am 35ba2cdb: Merge "Inherit ABI when moving exist...
Jeff Sharkey [Thu, 27 Aug 2015 17:55:09 +0000 (17:55 +0000)]
am 85b00533: am 83f5bff6: (-s ours) am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev

* commit '85b0053347bee68c5ff66e1b37620a0cb4d62883':

8 years agoam 501879ba: am 0571c02d: (-s ours) am 9bdb7bfd: Merge "Bidi-wrap the results of...
Roozbeh Pournader [Thu, 27 Aug 2015 17:54:52 +0000 (17:54 +0000)]
am 501879ba: am 0571c02d: (-s ours) am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

* commit '501879bac939a3ed58e2871ab3a084db12fbe779':

8 years agoam 9e648073: (-s ours) am 0de7cba0: (-s ours) am a6bf393d: (-s ours) Merge "Import...
Geoff Mendal [Thu, 27 Aug 2015 17:54:35 +0000 (17:54 +0000)]
am 9e648073: (-s ours) am 0de7cba0: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9e6480734b52a10f2e5d0463c841b2aad3ac9d24':

8 years agoam d1abf9fe: am 86e56bb3: (-s ours) am 78ead58d: Merge "Fix issue #22531747: Assist...
Dianne Hackborn [Thu, 27 Aug 2015 17:54:12 +0000 (17:54 +0000)]
am d1abf9fe: am 86e56bb3: (-s ours) am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev

* commit 'd1abf9fe9bf6b4984a8ec834662799584d0199e9':

8 years agoam 0ee71576: am e4764abd: (-s ours) am bde85f74: Merge "Fixed issue with background...
Wale Ogunwale [Thu, 27 Aug 2015 17:53:57 +0000 (17:53 +0000)]
am 0ee71576: am e4764abd: (-s ours) am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev

* commit '0ee715767fda64632cfb6e980246b6853a7975c5':

8 years agoam 7b80cb95: am d199589b: (-s ours) am 2dcfc7a9: Merge "Fix for MidiManager bug"...
Ricardo Garcia [Thu, 27 Aug 2015 17:53:43 +0000 (17:53 +0000)]
am 7b80cb95: am d199589b: (-s ours) am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev

* commit '7b80cb9515b52d357997d0639da24ed8c42ceb97':

8 years agoam 0e0ecf9e: am ffdd2e85: (-s ours) am 072e04a7: Merge "Bug: 22598083 Document how...
Billy Lau [Thu, 27 Aug 2015 17:53:35 +0000 (17:53 +0000)]
am 0e0ecf9e: am ffdd2e85: (-s ours) am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

* commit '0e0ecf9e98d09f112b7d5ac0c81ecd8b49d4fe55':

8 years agoam 3765a912: am 461031f6: (-s ours) am 71780e79: Merge "Better logging of MediaPlayer...
Jeff Sharkey [Thu, 27 Aug 2015 17:53:27 +0000 (17:53 +0000)]
am 3765a912: am 461031f6: (-s ours) am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev

* commit '3765a912b67b5677f964f8815864bd3f19db1ad7':

8 years agoam 79ac13d1: am 0f7e973d: (-s ours) am 698250fa: Merge "Media button intent should...
Jean-Michel Trivi [Thu, 27 Aug 2015 17:53:18 +0000 (17:53 +0000)]
am 79ac13d1: am 0f7e973d: (-s ours) am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev

* commit '79ac13d1584f3e5dd003d9b04d09b89d246f4fd1':

8 years agoam 43b94bc5: am 5b1ec7e7: (-s ours) am 6afdad7e: Merge "Don\'t fall back to domain...
Christopher Tate [Thu, 27 Aug 2015 17:53:06 +0000 (17:53 +0000)]
am 43b94bc5: am 5b1ec7e7: (-s ours) am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev

* commit '43b94bc5edaa0f2c73dfc161eb3f7701e13d480e':

8 years agoam c3c7a635: am 7f19c443: (-s ours) am 29cf9aea: Adjust fingerprint icon placement...
Jorim Jaggi [Thu, 27 Aug 2015 17:52:47 +0000 (17:52 +0000)]
am c3c7a635: am 7f19c443: (-s ours) am 29cf9aea: Adjust fingerprint icon placement to spec

* commit 'c3c7a6350653b53dc0ad5733d452f4571c3dab6a':

8 years agoam 92f619fb: am ce7ef752: (-s ours) am 0bb5c26b: Merge "Fix AssetAtlas usage in Bitma...
Chris Craik [Thu, 27 Aug 2015 17:52:05 +0000 (17:52 +0000)]
am 92f619fb: am ce7ef752: (-s ours) am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev

* commit '92f619fbad49d8b5292ca6fb97683295b0910e89':

8 years agoam 6c91c60c: am 495cd539: (-s ours) am 57ee4b87: Merge "Fix image wallpaper size...
Adrian Roos [Thu, 27 Aug 2015 17:51:12 +0000 (17:51 +0000)]
am 6c91c60c: am 495cd539: (-s ours) am 57ee4b87: Merge "Fix image wallpaper size" into mnc-dev

* commit '6c91c60cd4c674e7b35c286aeeb61ddd6073af7a':

8 years agoam 433a8ae3: am 9f01d72f: (-s ours) am c9eb398a: Merge "Clear identity when killing...
Jeff Sharkey [Thu, 27 Aug 2015 17:50:32 +0000 (17:50 +0000)]
am 433a8ae3: am 9f01d72f: (-s ours) am c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev

* commit '433a8ae3d8851e136b75174e2aa89e71b9634f7a':

8 years agoam dfbcbcb9: am f5f85001: (-s ours) am d3f327be: Merge "Localize SimpleMonthView...
Chet Haase [Thu, 27 Aug 2015 17:49:56 +0000 (17:49 +0000)]
am dfbcbcb9: am f5f85001: (-s ours) am d3f327be: Merge "Localize SimpleMonthView" into mnc-dev

* commit 'dfbcbcb9c8ed61eefbc192807f80f7ec8ac22d3d':

8 years agoam 756485b3: am ee249f35: (-s ours) am 25945302: Merge "Persist version data on a...
Jeff Sharkey [Thu, 27 Aug 2015 17:49:28 +0000 (17:49 +0000)]
am 756485b3: am ee249f35: (-s ours) am 25945302: Merge "Persist version data on a per-volume basis." into mnc-dev

* commit '756485b306f7f0db3fea8f3b12e4037c73c83a37':

8 years agoam 5925036b: am bdb2e9d8: (-s ours) am 822f6141: Merge "Add API to turn OFF "best...
xinhe [Thu, 27 Aug 2015 17:49:10 +0000 (17:49 +0000)]
am 5925036b: am bdb2e9d8: (-s ours) am 822f6141: Merge "Add API to turn OFF "best network selection" feature" into mnc-dev

* commit '5925036b2471dcfdfb5b614bfd2a15704e59c5b0':

8 years agoam acdfba26: am dd67c9d6: (-s ours) am 0f5b7bc2: am 79a1bde2: Merge "Add a flag to...
Stephen Hines [Thu, 27 Aug 2015 17:48:43 +0000 (17:48 +0000)]
am acdfba26: am dd67c9d6: (-s ours) am 0f5b7bc2: am 79a1bde2: Merge "Add a flag to the API to specify -O0 on the bcc command line."

* commit 'acdfba266444cba4db27dded307268f59221f027':

8 years agoam 89c2ea3b: am 98ddad40: (-s ours) am fbc6f2cb: Merge "Revert "Do not auto grant...
Svetoslav Ganov [Thu, 27 Aug 2015 17:48:07 +0000 (17:48 +0000)]
am 89c2ea3b: am 98ddad40: (-s ours) am fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev

* commit '89c2ea3b4781f5d775ec7c9ebe36a11eb85fe561':

8 years agoam 5b3059d2: am 96311136: (-s ours) am 5c269121: Merge "Work on issue #22556778:...
Dianne Hackborn [Thu, 27 Aug 2015 17:47:16 +0000 (17:47 +0000)]
am 5b3059d2: am 96311136: (-s ours) am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev

* commit '5b3059d2e07707394211255dde425ed5f1f8bd67':

8 years agoam f9099c68: am b6eb10db: (-s ours) am 5ff4383b: Merge "Grant default permissions...
Svet Ganov [Thu, 27 Aug 2015 17:46:33 +0000 (17:46 +0000)]
am f9099c68: am b6eb10db: (-s ours) am 5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev

* commit 'f9099c68595a6b1d84b2b283b92967ff29359364':

8 years agoam 1cdb44d1: am 15db4eae: (-s ours) am 4a1421f3: Merge "Do not auto grant GET_ACCOUNT...
Svet Ganov [Thu, 27 Aug 2015 17:45:58 +0000 (17:45 +0000)]
am 1cdb44d1: am 15db4eae: (-s ours) am 4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev

* commit '1cdb44d1243ecc6ab4143d5c39cf8b35051e37c8':

8 years agoam 5817a2e2: am 268eb72c: (-s ours) am 094c82ad: Merge "Scaling (Animated)VectorDrawa...
ztenghui [Thu, 27 Aug 2015 17:45:29 +0000 (17:45 +0000)]
am 5817a2e2: am 268eb72c: (-s ours) am 094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev

* commit '5817a2e249ed6af8ae63f31d1503f6c22cb5768d':

8 years agoam 2a1b3300: am f6e06144: (-s ours) am 3368e69e: Merge "Remove focusablilty of the...
Julia Reynolds [Thu, 27 Aug 2015 17:45:01 +0000 (17:45 +0000)]
am 2a1b3300: am f6e06144: (-s ours) am 3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev

* commit '2a1b330009981d16a0d4901b4051e3713352d0d6':

8 years agoam 1d36b9e2: am 566c796a: (-s ours) am af814340: Merge "Fixed bad merge conflict...
Wale Ogunwale [Thu, 27 Aug 2015 17:44:35 +0000 (17:44 +0000)]
am 1d36b9e2: am 566c796a: (-s ours) am af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev

* commit '1d36b9e2299b9823e5bedbaba9fb7c2d0fd94974':

8 years agoam 60eea28f: am 2693eea2: (-s ours) am 9c98b859: Merge "Update stylus gesture to...
Mady Mellor [Thu, 27 Aug 2015 17:44:05 +0000 (17:44 +0000)]
am 60eea28f: am 2693eea2: (-s ours) am 9c98b859: Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev

* commit '60eea28f1ba148bf78c6d67ec1ff1f4aba7c167e':

8 years agoam 40496297: am a14b0339: (-s ours) am ad359f2e: Merge "Revert "Don\'t display Custom...
Tingting Wang [Thu, 27 Aug 2015 17:43:29 +0000 (17:43 +0000)]
am 40496297: am a14b0339: (-s ours) am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev

* commit '404962977b66a0e3cc1bf9bc9373354b049cdb7a':

8 years agoam 59e92239: am 2d395df9: (-s ours) am 2a500e32: Merge "Revert "Temporary lower GET_A...
Svetoslav Ganov [Thu, 27 Aug 2015 17:42:59 +0000 (17:42 +0000)]
am 59e92239: am 2d395df9: (-s ours) am 2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev

* commit '59e9223965bd0b5bf41868ff56f1d4d77f92dc70':

8 years agoam 0cbfa6b2: am 8ffb3269: (-s ours) am ecb88792: Merge "Temporary lower GET_ACCOUNTS...
Svet Ganov [Thu, 27 Aug 2015 17:42:43 +0000 (17:42 +0000)]
am 0cbfa6b2: am 8ffb3269: (-s ours) am ecb88792: Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev

* commit '0cbfa6b2a5c6fae87eefe5b596dadca7c0228838':

8 years agoam 37c6bb75: am 6dfe05b2: (-s ours) am aa9a27bb: Merge "Camera2: Update FAST mode...
Chien-Yu Chen [Thu, 27 Aug 2015 17:42:30 +0000 (17:42 +0000)]
am 37c6bb75: am 6dfe05b2: (-s ours) am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev

* commit '37c6bb75b9c334d49a9521b6654cef21ad7f4b1d':

8 years agoam 24d1c2ef: am e09a78d3: (-s ours) am 6e8a551f: Merge "Camera2: Add hidden experimen...
Eino-Ville Talvala [Thu, 27 Aug 2015 17:42:14 +0000 (17:42 +0000)]
am 24d1c2ef: am e09a78d3: (-s ours) am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev

* commit '24d1c2ef35653c70bc356ab0f1c18f1cc55debde':

8 years agoam f60d3cd7: am e2f7ef74: (-s ours) am 660322d8: Merge "Add transcription field to...
Nancy Chen [Thu, 27 Aug 2015 17:41:52 +0000 (17:41 +0000)]
am f60d3cd7: am e2f7ef74: (-s ours) am 660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev

* commit 'f60d3cd7685789001d7b2915d26cb994def8ab3c':

8 years agoam 8630dc6e: am a7ef7e8c: (-s ours) am 593aca12: Merge "Support 24 clock displays...
Julia Reynolds [Thu, 27 Aug 2015 17:41:17 +0000 (17:41 +0000)]
am 8630dc6e: am a7ef7e8c: (-s ours) am 593aca12: Merge "Support 24 clock displays in demo mode." into mnc-dev

* commit '8630dc6e2f032a9988fdd29241ed61592bea0261':

8 years agoam e8963bf4: am d251dc81: (-s ours) am 5fe22e4f: Merge "clear calling identity to...
Todd Kennedy [Thu, 27 Aug 2015 17:40:48 +0000 (17:40 +0000)]
am e8963bf4: am d251dc81: (-s ours) am 5fe22e4f: Merge "clear calling identity to dexopt" into mnc-dev

* commit 'e8963bf469fef1cded6b9cf606a76908dea3bd6c':

8 years agoam 077dbf13: am 90f2b9da: (-s ours) am e6b407b4: Merge "MediaSync: fix flush handling...
Lajos Molnar [Thu, 27 Aug 2015 17:40:31 +0000 (17:40 +0000)]
am 077dbf13: am 90f2b9da: (-s ours) am e6b407b4: Merge "MediaSync: fix flush handling and deadlock" into mnc-dev

* commit '077dbf13036ef0ec59de079413b61500702b704c':

8 years agoam 75f58f7b: am 04405925: (-s ours) resolved conflicts for merge of 71165ea6 to mnc...
Neil Fuller [Thu, 27 Aug 2015 17:40:16 +0000 (17:40 +0000)]
am 75f58f7b: am 04405925: (-s ours) resolved conflicts for merge of 71165ea6 to mnc-dev-plus-aosp

* commit '75f58f7b82fca44917b753b3c57f827a408860f1':

8 years agoam 9630502f: am 37bbe618: (-s ours) am 9349093c: am 86917496: am a7581335: Merge...
Dirk Dougherty [Thu, 27 Aug 2015 17:40:03 +0000 (17:40 +0000)]
am 9630502f: am 37bbe618: (-s ours) am 9349093c: am 86917496: am a7581335: Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs

* commit '9630502fb96da45e1ee1b119555af80bcaa971e3':

8 years agoam 788eb39b: am c4d09707: (-s ours) am b43b06d1: Merge "Fixed a bug where notificatio...
Selim Cinek [Thu, 27 Aug 2015 17:39:47 +0000 (17:39 +0000)]
am 788eb39b: am c4d09707: (-s ours) am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev

* commit '788eb39bce132b665d5cd9590c2c5964fae392b3':

8 years agoam ed8f3c8a: am 4f8d5840: (-s ours) am 60e15dae: Merge "Fixed a bug where a fingerpri...
Selim Cinek [Thu, 27 Aug 2015 17:39:32 +0000 (17:39 +0000)]
am ed8f3c8a: am 4f8d5840: (-s ours) am 60e15dae: Merge "Fixed a bug where a fingerprint animation was not running" into mnc-dev

* commit 'ed8f3c8a9dbd4724f53130ae6d41247bbca05f17':

8 years agoam c80847d4: am 9cd77be1: (-s ours) am d19ed4c1: Merge "TIF: Avoid generating locale...
Jae Seo [Thu, 27 Aug 2015 17:39:09 +0000 (17:39 +0000)]
am c80847d4: am 9cd77be1: (-s ours) am d19ed4c1: Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev

* commit 'c80847d44bceb3e18f65d2d630d424407feb8fbb':

8 years agoam b6de88fa: am 45b28129: (-s ours) am 86647987: Icon-related Notifications API changes:
Dan Sandler [Thu, 27 Aug 2015 17:38:45 +0000 (17:38 +0000)]
am b6de88fa: am 45b28129: (-s ours) am 86647987: Icon-related Notifications API changes:

* commit 'b6de88faf5011d7358dfd78130831ac861d3d690':

8 years agoam 79b4150c: am 86c421b4: (-s ours) am 5536bb48: Merge "Fix stuck scrim on keyguard...
Adrian Roos [Thu, 27 Aug 2015 17:38:18 +0000 (17:38 +0000)]
am 79b4150c: am 86c421b4: (-s ours) am 5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev

* commit '79b4150c667231be0b7c6d4e8d9a65d2cd6f314e':

8 years agoam 24edbe02: am 0cad2b60: (-s ours) am 9ba039bb: Merge "Update ChooserTarget construc...
Adam Powell [Thu, 27 Aug 2015 17:38:01 +0000 (17:38 +0000)]
am 24edbe02: am 0cad2b60: (-s ours) am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev

* commit '24edbe024b3370d2b7abd3a7ee008b5bcd658258':

8 years agoam e508d867: am 2264842f: (-s ours) am 6f561a24: Merge "Improve documentation of...
Svet Ganov [Thu, 27 Aug 2015 17:37:46 +0000 (17:37 +0000)]
am e508d867: am 2264842f: (-s ours) am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev

* commit 'e508d867e3cfd285dc996644c983093afc9bdd32':

8 years agoam 504e699a: am d352bb55: (-s ours) am 5aff3b54: Merge "Maintain call time across...
Roshan Pius [Thu, 27 Aug 2015 17:37:35 +0000 (17:37 +0000)]
am 504e699a: am d352bb55: (-s ours) am 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev

* commit '504e699a59f1432c43ccf3af685a0557922824f0':

8 years agoam 75efd80b: am 3ddc42fe: (-s ours) am f7592b23: Merge "HMAC keys are authorized...
Alex Klyubin [Thu, 27 Aug 2015 17:37:25 +0000 (17:37 +0000)]
am 75efd80b: am 3ddc42fe: (-s ours) am f7592b23: Merge "HMAC keys are authorized for exactly one digest." into mnc-dev

* commit '75efd80b2b15ac693d1693c495a3d728839b1376':

8 years agoam 2bab9d74: am f10d7708: (-s ours) am d4b566bf: Merge "Add APIs for verifier to...
Svet Ganov [Thu, 27 Aug 2015 17:37:18 +0000 (17:37 +0000)]
am 2bab9d74: am f10d7708: (-s ours) am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev

* commit '2bab9d74f5d1fef179b250630fec837d0d9e9ac0':

8 years agoam e018d8be: am cb778a8e: (-s ours) am 0f724601: Merge "Fix clip area behavior for...
Chris Craik [Thu, 27 Aug 2015 17:37:10 +0000 (17:37 +0000)]
am e018d8be: am cb778a8e: (-s ours) am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev

* commit 'e018d8be73858039aa2d229873102d609da2e649':

8 years agoam 13184037: am 628d4653: (-s ours) am aaee5b53: Merge "Work on issue #22516282:...
Dianne Hackborn [Thu, 27 Aug 2015 17:36:57 +0000 (17:36 +0000)]
am 13184037: am 628d4653: (-s ours) am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev

* commit '131840372a1bb2dd305be625dcb07ebdf35e4ca7':

8 years agoam dbf8c417: am 890e3064: (-s ours) am b09b84ca: Merge "DefaultPermission: GET_ACCOUN...
Makoto Onuki [Thu, 27 Aug 2015 17:36:45 +0000 (17:36 +0000)]
am dbf8c417: am 890e3064: (-s ours) am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev

* commit 'dbf8c417ce56540e9a12443f13abbadadea51100':

8 years agoam 040081b1: am f1be0792: (-s ours) am db8fa48e: Merge "Return a result from Fragment...
Svet Ganov [Thu, 27 Aug 2015 17:36:28 +0000 (17:36 +0000)]
am 040081b1: am f1be0792: (-s ours) am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev

* commit '040081b1c2e267054e1f19aefeb6a75df671b8b9':

8 years agoam 38f61814: am d8a869cb: (-s ours) am 081649c2: am f4db2de8: am 1b29a957: Merge...
Robert Schaub [Thu, 27 Aug 2015 17:35:59 +0000 (17:35 +0000)]
am 38f61814: am d8a869cb: (-s ours) am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs

* commit '38f61814f114503ab8bc9a8487ba867b814a7121':

8 years agoam eda87980: am cf5375d8: (-s ours) am 8983420d: Merge "Don\'t spam the system with...
Dianne Hackborn [Thu, 27 Aug 2015 17:35:39 +0000 (17:35 +0000)]
am eda87980: am cf5375d8: (-s ours) am 8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev

* commit 'eda87980f671057a414d0e21efc60bc9235d8984':

8 years agoam bf206804: am 588f5739: (-s ours) am d96243a1: am 10653cef: Merge "fix BNNM docs"
Miao Wang [Thu, 27 Aug 2015 17:35:21 +0000 (17:35 +0000)]
am bf206804: am 588f5739: (-s ours) am d96243a1: am 10653cef: Merge "fix BNNM docs"

* commit 'bf206804de541f20e4cfac9ff40f21ff29c5fe60':

8 years agoam 012956b0: am ff4b10d3: (-s ours) am a4911ed9: Merge "Verfiy global apps with devic...
Todd Kennedy [Thu, 27 Aug 2015 17:35:04 +0000 (17:35 +0000)]
am 012956b0: am ff4b10d3: (-s ours) am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev

* commit '012956b0feebedd11410556268ba2dac7d4688ac':

8 years agoam adc2e039: am fde33da1: (-s ours) am 11813232: Merge "Animate app exit for cases...
Wale Ogunwale [Thu, 27 Aug 2015 17:34:56 +0000 (17:34 +0000)]
am adc2e039: am fde33da1: (-s ours) am 11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev

* commit 'adc2e039ec17e1f07faf706f91ff69870585da89':

8 years agoam 840af451: am 7e560444: (-s ours) am ba4f0757: Merge "Don\'t crash on makeCurrent...
John Reck [Thu, 27 Aug 2015 17:34:45 +0000 (17:34 +0000)]
am 840af451: am 7e560444: (-s ours) am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev

* commit '840af451e502ba1d83da0a3a4fc4d593eaf63a9c':

8 years agoam b9510506: am e90017d9: (-s ours) am 532737df: Merge "Fix calendar reminder notific...
Tony Mak [Thu, 27 Aug 2015 17:34:30 +0000 (17:34 +0000)]
am b9510506: am e90017d9: (-s ours) am 532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev

* commit 'b95105065015686cc11870ee5e95493896915a49':

8 years agoam 8848786f: am 5fb324ad: (-s ours) am bd87b6b5: Merge "Make additional shared elemen...
George Mount [Thu, 27 Aug 2015 17:34:09 +0000 (17:34 +0000)]
am 8848786f: am 5fb324ad: (-s ours) am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev

* commit '8848786fbbc0895a313187dc17a6c1f24be7891f':

8 years agoam 8a422246: am 7f35b0d2: (-s ours) am 30c8245a: Merge "Add data binding to built...
George Mount [Thu, 27 Aug 2015 17:33:34 +0000 (17:33 +0000)]
am 8a422246: am 7f35b0d2: (-s ours) am 30c8245a: Merge "Add data binding to built javadoc." into mnc-dev

* commit '8a42224620b30941415b527145051e04a62a5635':

8 years agoam 79ec2b20: am 0f2b3abf: (-s ours) am dbdf7c45: Don\'t send app links to the parent...
Nicolas Prevot [Thu, 27 Aug 2015 17:32:45 +0000 (17:32 +0000)]
am 79ec2b20: am 0f2b3abf: (-s ours) am dbdf7c45: Don\'t send app links to the parent if status = never (part 2)

* commit '79ec2b2033e2f3132bca911b7ced0bf14b02caf0':

8 years agoam 01f9e8fe: am 2b5dfb97: (-s ours) am 98f3d953: am eccbc7c9: Merge "Fix NativeCrashL...
Neil Fuller [Thu, 27 Aug 2015 17:31:53 +0000 (17:31 +0000)]
am 01f9e8fe: am 2b5dfb97: (-s ours) am 98f3d953: am eccbc7c9: Merge "Fix NativeCrashListener"

* commit '01f9e8fec0ce586be0dc4cd26d2680f5d6347353':

8 years agoam f83861ce: am 95b869e2: (-s ours) am 737106a6: am 1ecfdf33: Merge "docs: Add an...
Narayan Kamath [Thu, 27 Aug 2015 17:31:18 +0000 (17:31 +0000)]
am f83861ce: am 95b869e2: (-s ours) am 737106a6: am 1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"

* commit 'f83861ce237416a25c787b76d34006360a871e8d':

8 years agoam 5ab5dd6e: am d56efb48: (-s ours) am 47e04090: Merge "Remove redundant cancel event...
Vineeta Srivastava [Thu, 27 Aug 2015 17:30:52 +0000 (17:30 +0000)]
am 5ab5dd6e: am d56efb48: (-s ours) am 47e04090: Merge "Remove redundant cancel events from FingerprintService" into mnc-dev

* commit '5ab5dd6e9df4081e65fa09accbf09acee34a0648':

8 years agoam cc0ddfc3: am 152c2e9a: (-s ours) am ea975b12: Merge "Add new API for handling...
Sanket Padawe [Thu, 27 Aug 2015 17:30:31 +0000 (17:30 +0000)]
am cc0ddfc3: am 152c2e9a: (-s ours) am ea975b12: Merge "Add new API for handling DB query per subId." into mnc-dev

* commit 'cc0ddfc39f40d0489bcd4f51c87d14db4d0b71eb':

8 years agoam 2ae322d3: am 979939ef: (-s ours) am c0aa9744: Merge "PopupWindow position must...
Yohei Yukawa [Thu, 27 Aug 2015 17:29:50 +0000 (17:29 +0000)]
am 2ae322d3: am 979939ef: (-s ours) am c0aa9744: Merge "PopupWindow position must be specified in window coordinates." into mnc-dev

* commit '2ae322d367b47458bb8b582598c4b2217854046b':

8 years agoam 872d03e9: am a0d9be5a: (-s ours) am ebbe7706: Merge "Fix comment bug in I71a8d356e...
Yohei Yukawa [Thu, 27 Aug 2015 17:28:54 +0000 (17:28 +0000)]
am 872d03e9: am a0d9be5a: (-s ours) am ebbe7706: Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev

* commit '872d03e915ed06424afd560417f7502429c75b2a':

8 years agoam 712d8bed: am 3ad2f45b: (-s ours) am a36c5580: Merge "Fix a bug disappearing instal...
Chris Tate [Thu, 27 Aug 2015 17:28:03 +0000 (17:28 +0000)]
am 712d8bed: am 3ad2f45b: (-s ours) am a36c5580: Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev

* commit '712d8bed243f42d70c228bfbe4a6fc430123e2b5':

8 years agoam e4784e77: am 6a10b84b: (-s ours) am a8455147: (-s ours) am 2fccb66d: Merge "Fix...
Chris Tate [Thu, 27 Aug 2015 17:27:14 +0000 (17:27 +0000)]
am e4784e77: am 6a10b84b: (-s ours) am a8455147: (-s ours) am 2fccb66d: Merge "Fix a bug disappearing installerPackageName info of packages after reboot."

* commit 'e4784e77508ec45e6c2c04fce9a432024bc8007a':

8 years agoam 4d6d977e: am 03727c2f: (-s ours) am a6ad75fb: Merge "Add tools:openDrawer to open...
Deepanshu Gupta [Thu, 27 Aug 2015 17:26:45 +0000 (17:26 +0000)]
am 4d6d977e: am 03727c2f: (-s ours) am a6ad75fb: Merge "Add tools:openDrawer to open a DrawerLayout." into mnc-dev

* commit '4d6d977ef73f283a67867da6967c29e8d170144a':

8 years agoam 8bec070c: am adb63087: (-s ours) am 43286266: Merge "Change tools:list_item to...
Deepanshu Gupta [Thu, 27 Aug 2015 17:26:23 +0000 (17:26 +0000)]
am 8bec070c: am adb63087: (-s ours) am 43286266: Merge "Change tools:list_item to listitem." into mnc-dev

* commit '8bec070c40b518f118ed1596780e5fceefc1d1ae':

8 years agoam 8db5cf67: am ad4f73ef: (-s ours) am a73face3: am 8c5f34de: am b53568f2: docs:...
Robert Schaub [Thu, 27 Aug 2015 17:26:00 +0000 (17:26 +0000)]
am 8db5cf67: am ad4f73ef: (-s ours) am a73face3: am 8c5f34de: am b53568f2: docs: Added word "video" to tv app quality guidelines.

* commit '8db5cf67485ca0d0a82e6a66e97d4794d7f3955f':

8 years agoam f85b20df: am bce08880: (-s ours) am 8703e50d: Merge "Allow selecting quick setting...
Jun Mukai [Thu, 27 Aug 2015 17:25:30 +0000 (17:25 +0000)]
am f85b20df: am bce08880: (-s ours) am 8703e50d: Merge "Allow selecting quick setting items by keyboard." into mnc-dev

* commit 'f85b20df37076fd6ba05453a2b3997f19f2d90d6':

8 years agoam 411f6608: am 3812cfb8: (-s ours) am 84f8a096: Merge "Make "dismiss all" button...
Oren Blasberg [Thu, 27 Aug 2015 17:24:47 +0000 (17:24 +0000)]
am 411f6608: am 3812cfb8: (-s ours) am 84f8a096: Merge "Make "dismiss all" button keyboard accessible." into mnc-dev

* commit '411f66082f55c290efab3eda6ee599f17eed9f3a':

8 years agoam d5cb85c2: am d83f4acc: (-s ours) am fc8e923d: Merge "Fix wrong tint mode on airpla...
Adrian Roos [Thu, 27 Aug 2015 17:24:14 +0000 (17:24 +0000)]
am d5cb85c2: am d83f4acc: (-s ours) am fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev

* commit 'd5cb85c29be4b496d65c15f655c6d9bc7f7711ba':

8 years agoam ac5c6358: am c01d80c3: (-s ours) am 3b1f8607: Merge "Intent filters need CATEGORY_...
Christopher Tate [Thu, 27 Aug 2015 17:23:57 +0000 (17:23 +0000)]
am ac5c6358: am c01d80c3: (-s ours) am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev

* commit 'ac5c6358ffd4487efe85bb6bb144fdf3ce7d72ba':

8 years agoam 54ae6d2a: am 1db9717a: (-s ours) am 008409a2: Merge "Bug: 21589105 Rescoping SYSTE...
Billy Lau [Thu, 27 Aug 2015 17:23:41 +0000 (17:23 +0000)]
am 54ae6d2a: am 1db9717a: (-s ours) am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev

* commit '54ae6d2a8346ea673899961f49509d329b65f6f3':

8 years agoam f74062a9: am e13f9e41: (-s ours) am f6586cbd: Merge "Implement issue #22403908...
Dianne Hackborn [Thu, 27 Aug 2015 17:23:26 +0000 (17:23 +0000)]
am f74062a9: am e13f9e41: (-s ours) am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev

* commit 'f74062a94c3cdbb74c5d25824a76f0901f99a890':

8 years agoam 7feb3bab: am b742acaa: (-s ours) am 67e02e60: Merge "Fix issue #22487155: Device...
Dianne Hackborn [Thu, 27 Aug 2015 17:23:09 +0000 (17:23 +0000)]
am 7feb3bab: am b742acaa: (-s ours) am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev

* commit '7feb3bab06da3de726c019db00e4692c73d41981':

8 years agoam 514154e4: am cc8555bf: (-s ours) am c4e2bcd4: Merge "Fix issue #22460110: AssistSt...
Dianne Hackborn [Thu, 27 Aug 2015 17:22:46 +0000 (17:22 +0000)]
am 514154e4: am cc8555bf: (-s ours) am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev

* commit '514154e4481c1ea2fde148d6a8ed9263271f30ed':

8 years agoam 9a24ac2f: am 10442514: (-s ours) am c1a49b50: Merge "Fix issue #22479881: Nexus...
Dianne Hackborn [Thu, 27 Aug 2015 17:22:10 +0000 (17:22 +0000)]
am 9a24ac2f: am 10442514: (-s ours) am c1a49b50: Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev

* commit '9a24ac2f26d95f90e43f44c3fe36554baf4a2853':

8 years agoam 28144c34: am 190b8470: (-s ours) am 1cf8b0b6: Merge "Fix issue #22124996: VI:...
Dianne Hackborn [Thu, 27 Aug 2015 17:21:39 +0000 (17:21 +0000)]
am 28144c34: am 190b8470: (-s ours) am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev

* commit '28144c343110bcd53c66536fe4ae0acda45e6279':

8 years agoam 822df7f0: am 4b27514e: (-s ours) am 08dda27b: Merge "Make sure we get valid packag...
Svetoslav [Thu, 27 Aug 2015 17:21:22 +0000 (17:21 +0000)]
am 822df7f0: am 4b27514e: (-s ours) am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev

* commit '822df7f0a5514078f2240173546661c620068887':

8 years agoam ddcfa831: am df263ee8: (-s ours) am 06476508: Merge "Resolve based on the correct...
Christopher Tate [Thu, 27 Aug 2015 17:21:06 +0000 (17:21 +0000)]
am ddcfa831: am df263ee8: (-s ours) am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev

* commit 'ddcfa83112f4e1dcdd467587110174f3803d7f5b':

8 years agoam 10b9e88d: am 5db78381: (-s ours) am 6a401410: Merge "Let the ActionBar handle...
Abodunrinwa Toki [Thu, 27 Aug 2015 17:20:51 +0000 (17:20 +0000)]
am 10b9e88d: am 5db78381: (-s ours) am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev

* commit '10b9e88da37dcf02ae7f3cf5484de2a658c7091f':

8 years agoam ad2c5e96: am 9ee3b6f1: (-s ours) am ad904cf3: Merge "fix BNNM docs" into mnc-dev
Miao Wang [Thu, 27 Aug 2015 17:20:35 +0000 (17:20 +0000)]
am ad2c5e96: am 9ee3b6f1: (-s ours) am ad904cf3: Merge "fix BNNM docs" into mnc-dev

* commit 'ad2c5e968866e8a6fdbaf3b8ad796d053c084af7':

8 years agoam c79e23b1: am 7a14c11d: (-s ours) am 75f6b94a: Merge "Grant default permissions...
Svet Ganov [Thu, 27 Aug 2015 17:20:18 +0000 (17:20 +0000)]
am c79e23b1: am 7a14c11d: (-s ours) am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev

* commit 'c79e23b177cbcfa9302c25b1cf01c9033e6ff80e':

8 years agoam c0fc3075: (-s ours) am 40c0d8c8: (-s ours) am 78b6e6c7: (-s ours) Merge "Import...
Geoff Mendal [Thu, 27 Aug 2015 17:19:55 +0000 (17:19 +0000)]
am c0fc3075: (-s ours) am 40c0d8c8: (-s ours) am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'c0fc307593fa512da28314c2a7ce682a525d5956':

8 years agoam a03e6b6e: am 5cdeb956: (-s ours) am 3a931d02: Merge "Show correct locked orientati...
Adrian Roos [Thu, 27 Aug 2015 17:19:35 +0000 (17:19 +0000)]
am a03e6b6e: am 5cdeb956: (-s ours) am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev

* commit 'a03e6b6e0626845b0d544ed89677465b1af9cf5d':

8 years agoam 58463380: (-s ours) am a437a516: (-s ours) am 4155d9f3: (-s ours) Merge "Import...
Geoff Mendal [Thu, 27 Aug 2015 17:19:20 +0000 (17:19 +0000)]
am 58463380: (-s ours) am a437a516: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '58463380157c4d3796cf13f6564ab536e96f4cb0':

8 years agoam a654d946: (-s ours) am fd184821: (-s ours) am 197e7381: (-s ours) Merge "Import...
Geoff Mendal [Thu, 27 Aug 2015 17:19:12 +0000 (17:19 +0000)]
am a654d946: (-s ours) am fd184821: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'a654d94661316056ebc60032d4ec4c4a15cd3399':

8 years agoam 5699634c: (-s ours) am bf833850: (-s ours) am 6e149a25: (-s ours) Merge "Import...
Geoff Mendal [Thu, 27 Aug 2015 17:18:56 +0000 (17:18 +0000)]
am 5699634c: (-s ours) am bf833850: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '5699634c5662ddbe1cae332a9bd7c5200d36c5fe':

8 years agoam 94812627: (-s ours) am 3d345916: (-s ours) am a5516e80: (-s ours) Merge "Import...
Geoff Mendal [Thu, 27 Aug 2015 17:18:47 +0000 (17:18 +0000)]
am 94812627: (-s ours) am 3d345916: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9481262762e7708d77e67119d1774a2544215a5d':

8 years agoam cdf0af43: (-s ours) am 913f9a31: (-s ours) am ff994bd3: (-s ours) Merge "Import...
Geoff Mendal [Thu, 27 Aug 2015 17:18:39 +0000 (17:18 +0000)]
am cdf0af43: (-s ours) am 913f9a31: (-s ours) am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'cdf0af43e2db45caddb267101df305144ff1771b':

8 years agoam 0cb2f2a9: (-s ours) am 7550c53d: (-s ours) am 36c103d6: (-s ours) Merge "Import...
Geoff Mendal [Thu, 27 Aug 2015 17:18:31 +0000 (17:18 +0000)]
am 0cb2f2a9: (-s ours) am 7550c53d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '0cb2f2a9796474ed305af5bd9d72285fc01417d9':

8 years agoam 9608d29d: (-s ours) am f28f62fe: (-s ours) am e2a0d44c: (-s ours) Merge "Import...
Geoff Mendal [Thu, 27 Aug 2015 17:18:20 +0000 (17:18 +0000)]
am 9608d29d: (-s ours) am f28f62fe: (-s ours) am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9608d29d07e0b87a0e60b21e1e08ca7346426e47':