OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 9c00c3d5: (-s ours) am 8510d014: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Dec 2014 19:42:50 +0000 (19:42 +0000)]
am 9c00c3d5: (-s ours) am 8510d014: (-s ours) Import translations. DO NOT MERGE

* commit '9c00c3d57fcbaedfab096041fee4f4c2468b3ebf':
  Import translations. DO NOT MERGE

9 years agoam e734a86b: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Dec 2014 19:42:42 +0000 (19:42 +0000)]
am e734a86b: (-s ours) Import translations. DO NOT MERGE

* commit 'e734a86b69ca6d5a3e902f0ece0cd4ac86f6310e':
  Import translations. DO NOT MERGE

9 years agoam f5e44c29: am c5c93edd: Merge "When switching to default USB function set, check...
Zoltan Szatmary-Ban [Mon, 8 Dec 2014 19:42:17 +0000 (19:42 +0000)]
am f5e44c29: am c5c93edd: Merge "When switching to default USB function set, check restriction" into lmp-mr1-dev

* commit 'f5e44c29e85681fdcc6d09bfda503af99b4da543':
  When switching to default USB function set, check restriction

9 years agoam 0cc53a5b: am 15556bbb: Merge "CEC: Disable debug logging" into lmp-mr1-dev
Jinsuk Kim [Mon, 8 Dec 2014 19:42:08 +0000 (19:42 +0000)]
am 0cc53a5b: am 15556bbb: Merge "CEC: Disable debug logging" into lmp-mr1-dev

* commit '0cc53a5baefdd6b051251ec4bfeb1680e7a1c75c':
  CEC: Disable debug logging

9 years agoam 937cb812: am 01a7eeba: am d9babcf0: am 5939bd03: am 35ee3018: revisions to Studio...
smain@google.com [Mon, 8 Dec 2014 19:41:58 +0000 (19:41 +0000)]
am 937cb812: am 01a7eeba: am d9babcf0: am 5939bd03: am 35ee3018: revisions to Studio landing page

* commit '937cb812b689c9b3ee5ce9868422406c970cc4f0':
  revisions to Studio landing page

9 years agoam 195a0da4: am 229f8a3c: am e0245cb5: am 1f5b2510: am 2cfdbf5f: Merge "fix migrate...
smain@google.com [Mon, 8 Dec 2014 19:41:52 +0000 (19:41 +0000)]
am 195a0da4: am 229f8a3c: am e0245cb5: am 1f5b2510: am 2cfdbf5f: Merge "fix migrate guide and other studio edits cherryick from  Ic223d8fa3cd1e66ddd37b8f896fef12869be4268" into lmp-docs

* commit '195a0da45777b8a2549f93f3494abc5d59d2467b':
  fix migrate guide and other studio edits cherryick from  Ic223d8fa3cd1e66ddd37b8f896fef12869be4268

9 years agoam befef081: am 2b4bd09c: am d9c08bac: am 895ab42f: am 59a3dd7b: misc fixes for studi...
smain@google.com [Mon, 8 Dec 2014 19:41:42 +0000 (19:41 +0000)]
am befef081: am 2b4bd09c: am d9c08bac: am 895ab42f: am 59a3dd7b: misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.

* commit 'befef081a84f1d1911906811c9afd07b8c393c1f':
  misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.

9 years agoam d816a983: am c4bac980: am 44e7bcf4: am b6be2bff: am 40c4ccf4: Merge "doc: SDK...
Joe Fernandez [Mon, 8 Dec 2014 19:41:36 +0000 (19:41 +0000)]
am d816a983: am c4bac980: am 44e7bcf4: am b6be2bff: am 40c4ccf4: Merge "doc: SDK install page fix and link fixes" into lmp-docs

* commit 'd816a983927e382d2f6814053f339e4b59bdf871':
  doc: SDK install page fix and link fixes

9 years agoam 42b65c6e: am 4ec024e9: am 71319f28: am 160e7607: am dee9e37e: Merge "add studio...
smain@google.com [Mon, 8 Dec 2014 19:41:30 +0000 (19:41 +0000)]
am 42b65c6e: am 4ec024e9: am 71319f28: am 160e7607: am dee9e37e: Merge "add studio 1.0 files and reorder features list" into lmp-docs

* commit '42b65c6e89203bfbbc3175b4f4ff1be938aeca47':
  add studio 1.0 files and reorder features list

9 years agoam 5c09d4b8: am d7f9f30e: am dc842637: am ac3152ee: am 7b9ae53b: doc: fix for SDK...
Joe Fernandez [Mon, 8 Dec 2014 19:41:24 +0000 (19:41 +0000)]
am 5c09d4b8: am d7f9f30e: am dc842637: am ac3152ee: am 7b9ae53b: doc: fix for SDK installing page

* commit '5c09d4b8d8121514c63bd0cf72035a03d9ae8776':
  doc: fix for SDK installing page

9 years agoam 8804b2a6: am 4e0575be: am c10acd71: am 9a041f18: am d3c9f2b9: update studio hero...
smain@google.com [Mon, 8 Dec 2014 19:40:58 +0000 (19:40 +0000)]
am 8804b2a6: am 4e0575be: am c10acd71: am 9a041f18: am d3c9f2b9: update studio hero image and add section about code editor [CP]

* commit '8804b2a6e08b46112dcf3a5993b1254bba63131d':
  update studio hero image and add section about code editor [CP]

9 years agoam 6a0e1906: am 8fa02c18: am 08ba05b9: am 6cc5e87d: am 4083327e: docs:build system...
Rich Slogar [Mon, 8 Dec 2014 19:40:52 +0000 (19:40 +0000)]
am 6a0e1906: am 8fa02c18: am 08ba05b9: am 6cc5e87d: am 4083327e: docs:build system updates [CP]

* commit '6a0e190646a6c518a017007afbfb0d918d95df37':
  docs:build system updates [CP]

9 years agoam 8e29e218: am acd40aa9: am 67fa34e9: am 2d0cf342: am d0c79c4e: fix migrate guide...
smain@google.com [Mon, 8 Dec 2014 19:40:46 +0000 (19:40 +0000)]
am 8e29e218: am acd40aa9: am 67fa34e9: am 2d0cf342: am d0c79c4e: fix migrate guide and other studio edits [CP]

* commit '8e29e218a811237175f69b4260308fc653b77ff0':
  fix migrate guide and other studio edits [CP]

9 years agoam 8dac5b5e: am fedf3943: am c493dd3f: am e9f63a0f: am 5797e272: docs:sdk installing...
smain@google.com [Mon, 8 Dec 2014 19:40:22 +0000 (19:40 +0000)]
am 8dac5b5e: am fedf3943: am c493dd3f: am e9f63a0f: am 5797e272: docs:sdk installing file update [CP]

* commit '8dac5b5e8710b9d2ff8acbee3e2de349a9518f44':
  docs:sdk installing file update [CP]

9 years agoam c5d38e73: am baa56314: am f0eee644: am 521d7277: am 29e13c5a: new Android Studio...
smain@google.com [Mon, 8 Dec 2014 19:40:16 +0000 (19:40 +0000)]
am c5d38e73: am baa56314: am f0eee644: am 521d7277: am 29e13c5a: new Android Studio download page [CP]

* commit 'c5d38e7345e4185231197c2976fe2218a0547eeb':
  new Android Studio download page [CP]

9 years agoam d0a96b67: am cd13e657: am ca61ce33: am e1136835: am 5d9d7610: docs: publishing...
Rich Slogar [Mon, 8 Dec 2014 19:40:09 +0000 (19:40 +0000)]
am d0a96b67: am cd13e657: am ca61ce33: am e1136835: am 5d9d7610: docs: publishing with studio [CP]

* commit 'd0a96b6742e03213b8d8d28f13a069029514f6f9':
  docs: publishing with studio [CP]

9 years agoam d1ffd1e3: am 139c7def: am 53513e9e: am 5962474c: am fc64b70a: docs: new Eclipse...
smain@google.com [Mon, 8 Dec 2014 19:40:03 +0000 (19:40 +0000)]
am d1ffd1e3: am 139c7def: am 53513e9e: am 5962474c: am fc64b70a: docs: new Eclipse menu [CP]

* commit 'd1ffd1e3de1590ff7330706b8c1221992f3634ec':
  docs: new Eclipse menu [CP]

9 years agoam 2e3daaa6: am 6bbb5ed1: am 43304cfc: am 9e6ad10b: am e3fe9382: docs: studio basics...
Rich Slogar [Mon, 8 Dec 2014 19:39:55 +0000 (19:39 +0000)]
am 2e3daaa6: am 6bbb5ed1: am 43304cfc: am 9e6ad10b: am e3fe9382: docs: studio basics v2 [CP]

* commit '2e3daaa6ea3ca883b3d7c79761517dce35319d53':
  docs: studio basics v2 [CP]

9 years agoam e20c9496: am 0b52c5b3: am 88546c85: am 47a19d5d: am fdeb27f9: docs:download update...
Rich Slogar [Mon, 8 Dec 2014 19:39:48 +0000 (19:39 +0000)]
am e20c9496: am 0b52c5b3: am 88546c85: am 47a19d5d: am fdeb27f9: docs:download updates for studio [CP]

* commit 'e20c9496f63db7e6980e263ad884953d565ee54c':
  docs:download updates for studio [CP]

9 years agoam 7593c6ce: am bcb57c70: am 05d1ba69: am 84f7d62b: am 153c8287: docs:revision updates
Rich Slogar [Mon, 8 Dec 2014 19:39:42 +0000 (19:39 +0000)]
am 7593c6ce: am bcb57c70: am 05d1ba69: am 84f7d62b: am 153c8287: docs:revision updates

* commit '7593c6ce88550ee124e86ea2b2dc1caaa680ed51':
  docs:revision updates

9 years agoam 14965d0e: am 2abd2dd1: Merge "TIF: TvInputHardwareManager to listen to volume...
Wonsik Kim [Mon, 8 Dec 2014 19:39:31 +0000 (19:39 +0000)]
am 14965d0e: am 2abd2dd1: Merge "TIF: TvInputHardwareManager to listen to volume changes" into lmp-mr1-dev

* commit '14965d0ebb884106cdbe425b6e2b82d45238331b':
  TIF: TvInputHardwareManager to listen to volume changes

9 years agoam d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into...
Jean-Michel Trivi [Mon, 8 Dec 2014 19:39:10 +0000 (19:39 +0000)]
am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev

* commit 'd14f98fdcec65daae9f4db04f827036e5317b55c':
  Support collaborative audio focus handling

9 years agoam 1ce435cb: am 13a69707: am 1e51b3ae: am 14864414: am f7f20a45: docs:building your...
Rich Slogar [Mon, 8 Dec 2014 19:39:00 +0000 (19:39 +0000)]
am 1ce435cb: am 13a69707: am 1e51b3ae: am 14864414: am f7f20a45: docs:building your first app [CP]

* commit '1ce435cb232772d6f6e633f3d388bae6d9a13710':
  docs:building your first app [CP]

9 years agoam 6d3b6ff4: am fe3aabda: am bb642586: am 9fd7804b: am 377604af: docs: project update...
smain@google.com [Mon, 8 Dec 2014 19:38:54 +0000 (19:38 +0000)]
am 6d3b6ff4: am fe3aabda: am bb642586: am 9fd7804b: am 377604af: docs: project updates [CP]

* commit '6d3b6ff46e0550fd2c593931998cf54a5feaa231':
  docs: project updates [CP]

9 years agoam 13b29519: am 382040d4: am 5b2cac58: am f5fa25ec: am 9dd6a07f: docs: setup-virtual...
smain@google.com [Mon, 8 Dec 2014 19:38:48 +0000 (19:38 +0000)]
am 13b29519: am 382040d4: am 5b2cac58: am f5fa25ec: am 9dd6a07f: docs: setup-virtual-device [CP]

* commit '13b2951910178e8e7fc4fae1e3f700038621be98':
  docs: setup-virtual-device [CP]

9 years agoam bc683297: am 70d5341c: am 5b440be7: am d4c89098: am f592a587: docs support library...
Rich Slogar [Mon, 8 Dec 2014 19:38:42 +0000 (19:38 +0000)]
am bc683297: am 70d5341c: am 5b440be7: am d4c89098: am f592a587: docs support library updates [CP]

* commit 'bc683297e36a188a45c7c54558d8c27dd6feda48':
  docs support library updates [CP]

9 years agoam 2bba0c94: am 892577b0: am 86db5b43: am ff88ac5e: am 7a69c2de: docs: debugging...
Rich Slogar [Mon, 8 Dec 2014 19:38:36 +0000 (19:38 +0000)]
am 2bba0c94: am 892577b0: am 86db5b43: am ff88ac5e: am 7a69c2de: docs: debugging studio [CP]

* commit '2bba0c94f3e7726cc58d470094acd116db4ab36b':
  docs: debugging studio [CP]

9 years agoam 46150b5f: am 51ffc634: am bf96a239: am 5aac6042: am cc4d08b4: docs:setting up...
Rich Slogar [Mon, 8 Dec 2014 19:38:30 +0000 (19:38 +0000)]
am 46150b5f: am 51ffc634: am bf96a239: am 5aac6042: am cc4d08b4: docs:setting up hardware devices [CP]

* commit '46150b5f20098d3902495dde1c9f978f0d69ca0e':
  docs:setting up hardware devices [CP]

9 years agoam 5da1430e: am a402fa5f: am f26726b1: am 63d5c3e1: am d16db79e: docs: workflow index...
Rich Slogar [Mon, 8 Dec 2014 19:38:25 +0000 (19:38 +0000)]
am 5da1430e: am a402fa5f: am f26726b1: am 63d5c3e1: am d16db79e: docs: workflow index [CP]

* commit '5da1430e7e838e7a36482d605ee3fad121afe0f6':
  docs: workflow index [CP]

9 years agoam 359e5597: am d5b6d08e: am 8fbb3f6e: am cf516099: am 5e8d9a02: docs: tools help...
Rich Slogar [Mon, 8 Dec 2014 19:38:17 +0000 (19:38 +0000)]
am 359e5597: am d5b6d08e: am 8fbb3f6e: am cf516099: am 5e8d9a02: docs: tools help update [CP]

* commit '359e5597a9f890002f4bd2a66caa52100fa0defb':
  docs: tools help update [CP]

9 years agoam 43883b11: am 044a7802: am 4bc2c3bd: am 1efca60b: am e829d8fc: docs: Training refac...
Scott Rowe [Mon, 8 Dec 2014 19:37:50 +0000 (19:37 +0000)]
am 43883b11: am 044a7802: am 4bc2c3bd: am 1efca60b: am e829d8fc: docs: Training refactor for Android Studio [CP]

* commit '43883b11dec935aa545ee0cbb3660d0b84c36a53':
  docs: Training refactor for Android Studio [CP]

9 years agoam 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp...
Jinsuk Kim [Mon, 8 Dec 2014 19:37:44 +0000 (19:37 +0000)]
am 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev

* commit '122e704a017b51ffd3da0721059d04f00c726ce8':
  CEC: Avoid setting op in disabled mode

9 years agoam cac94aa0: am 06e922fc: am cf528ec7: am d56f55de: am caacc895: Fixes (updates)...
David Friedman [Mon, 8 Dec 2014 19:37:37 +0000 (19:37 +0000)]
am cac94aa0: am 06e922fc: am cf528ec7: am d56f55de: am caacc895: Fixes (updates) download links for NDK r10d.

* commit 'cac94aa0791b04fd328b18c56da3d4815f142fe7':
  Fixes (updates) download links for NDK r10d.

9 years agoam 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral...
Jeff Davidson [Mon, 8 Dec 2014 19:36:46 +0000 (19:36 +0000)]
am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev

* commit '5b8c5dd41e386e696d7e8705f84982a91d1596ae':
  Show "Connected via Wi-Fi assistant" for ephemeral networks.

9 years agoam 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions...
Jeff Davidson [Mon, 8 Dec 2014 19:36:39 +0000 (19:36 +0000)]
am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev

* commit '386effc7a160e330420f7746f41d46c12f64579d':
  Fix flipped captive portal bit in network conditions bcast.

9 years agoam 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241"...
Jeff Davidson [Mon, 8 Dec 2014 19:36:33 +0000 (19:36 +0000)]
am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev

* commit '401ef259f3b2c8c87b02c9939c0599d6ad0f6f39':
  add disable Ephemeral Network API Bug:18525241

9 years agoam c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once...
Jeremy Joslin [Mon, 8 Dec 2014 19:36:27 +0000 (19:36 +0000)]
am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev

* commit 'c4b2ec1a3a808c2dae0894e5f0cfd43d6ec1d5a2':
  Don't send the same PendingIntent more than once.

9 years agoam 068a0786: am 59dac0e1: Merge "Associate a UserHandle with each PhoneAccountHandle...
Evan Charlton [Mon, 8 Dec 2014 19:36:21 +0000 (19:36 +0000)]
am 068a0786: am 59dac0e1: Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev

* commit '068a078645b5f146c09a986398eda9df24d1ef3e':
  Associate a UserHandle with each PhoneAccountHandle

9 years agoam a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of...
Paul Jensen [Mon, 8 Dec 2014 19:36:08 +0000 (19:36 +0000)]
am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev

* commit 'a4afe13af38c03ae6abb76d2cf36ae0672328fd8':
  Reap unvalidated networks that have no chance of becoming highest scoring.

9 years agoam b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev
Jeff Tinker [Mon, 8 Dec 2014 19:35:59 +0000 (19:35 +0000)]
am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev

* commit 'b15a57d64d39315a9c1331d74a1ff5821f8b14d1':
  Unhide secure stop APIs

9 years agoam 6fac0351: am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN...
Jinsong Mu [Mon, 8 Dec 2014 19:35:31 +0000 (19:35 +0000)]
am 6fac0351: am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev

* commit '6fac0351cebf84cf9505246e1fec5d74a1fa49c0':
  Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003

9 years agoam 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number...
Ihab Awad [Mon, 8 Dec 2014 19:35:17 +0000 (19:35 +0000)]
am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev

* commit '2b45554454b6b9db3e2626fe3ca3cd5f42f960ca':
  Add Text-to-Speech annotations for phone number displays (1/3)

9 years agoam 7823e6ee: am 968ef51c: am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCo...
David Friedman [Mon, 8 Dec 2014 19:34:38 +0000 (19:34 +0000)]
am 7823e6ee: am 968ef51c: am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs

* commit '7823e6ee900547e32436d3c76f1709c926d08284':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117

9 years agoam 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService...
RoboErik [Mon, 8 Dec 2014 19:34:32 +0000 (19:34 +0000)]
am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev

* commit '2d7a1b09e93aec3baeb16f46fb203ae14555d4a7':
  Route mute key events through MediaSessionService

9 years agoam e6000f47: am 52fec470: am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added...
Quddus Chong [Mon, 8 Dec 2014 19:34:16 +0000 (19:34 +0000)]
am e6000f47: am 52fec470: am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs

* commit 'e6000f475346624587caa09cec37c85c3ab61ee8':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.

9 years agoam f428952e: am 9deffecc: am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated...
Quddus Chong [Mon, 8 Dec 2014 19:34:08 +0000 (19:34 +0000)]
am f428952e: am 9deffecc: am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs

* commit 'f428952e093239bce7c11eccc547a5094066c73f':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.

9 years agoam 80d11912: am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behin...
Wale Ogunwale [Mon, 8 Dec 2014 19:34:01 +0000 (19:34 +0000)]
am 80d11912: am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev

* commit '80d119121f62bf995ff856f6865a977eb8c03239':
  Don't destroy surfaces of activities launched behind early.

9 years agoam 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState...
Filip Gruszczynski [Mon, 8 Dec 2014 19:33:55 +0000 (19:33 +0000)]
am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev

* commit '91a5dd9b435982eaad9ac4d8443199d260ef7208':
  Fix calculation of overscan insets in WindowState.

9 years agoam e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated...
Dianne Hackborn [Mon, 8 Dec 2014 19:33:49 +0000 (19:33 +0000)]
am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev

* commit 'e52a2ea03bd7b8ed2f3680c5198e00fb7ad5c34c':
  Fix issue #17323751: Additional items in aggregated battery stats

9 years agoam 55034822: am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp"...
ztenghui [Mon, 8 Dec 2014 19:18:13 +0000 (19:18 +0000)]
am 55034822: am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev

* commit '550348220e959ff3c98b88c191a849ea2ee6062a':
  Fine tune the light radius from 800dp to 600dp

9 years agoam 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from...
Sanket Padawe [Mon, 8 Dec 2014 19:17:45 +0000 (19:17 +0000)]
am 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev

* commit '49aeee2e791ec85a1c2f202d29e7113dc9d9cae0':
  Doing provisioning check for wifi tethering from SystemUI

9 years agoam 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibil...
Eino-Ville Talvala [Mon, 8 Dec 2014 19:17:38 +0000 (19:17 +0000)]
am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev

* commit '4b905ad4368b9499238e975b670dd464586d6dd4':
  Camera2: Add HDR scene mode for backwards compatibility.

9 years agoam 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev
Eino-Ville Talvala [Mon, 8 Dec 2014 19:17:31 +0000 (19:17 +0000)]
am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev

* commit '3e3ae5b71590ce4272afaa5db1a1ff1fb26f4f6b':
  Fix docs build

9 years agoam eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp...
Stuart Scott [Mon, 8 Dec 2014 19:17:22 +0000 (19:17 +0000)]
am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev

* commit 'eb29c7332c40aacfae3dfb77588b262a043c94ee':
  Add mapping between RAT and Network Mode

9 years agoam 23ad6efb: am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed...
Jing Zhao [Mon, 8 Dec 2014 19:17:16 +0000 (19:17 +0000)]
am 23ad6efb: am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature

* commit '23ad6efbf81f1ea4f1e7b24ee0ca623045063b2f':
  Add checking to find AppDirectedSmsProxy for App Directed SMS feature

9 years agoam ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path...
Chris Wren [Mon, 8 Dec 2014 19:17:09 +0000 (19:17 +0000)]
am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev

* commit 'ea9abd14dc4d4028f74b079c0462dec4fa7d6d18':
  Avoid race condition in heads up snooze code path.

9 years agoam 41b0cbb3: am 2aa909f0: Merge "Correctly parse previous PMBA state during backup...
Christopher Tate [Mon, 8 Dec 2014 19:17:00 +0000 (19:17 +0000)]
am 41b0cbb3: am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev

* commit '41b0cbb3a6e6e51ae75a971c3c6b6e36950a2bf5':
  Correctly parse previous PMBA state during backup

9 years agoam a42d95f1: am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev
Christopher Tate [Mon, 8 Dec 2014 19:16:54 +0000 (19:16 +0000)]
am a42d95f1: am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev

* commit 'a42d95f1bc89dbbb4d34c62dac20ba3d9541603a':
  Tune delivery and batching of alarms

9 years agoam d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY...
Pavel Zhamaitsiak [Mon, 8 Dec 2014 19:16:43 +0000 (19:16 +0000)]
am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev

* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"

9 years agoam 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev
Justin Harrison [Mon, 8 Dec 2014 19:16:37 +0000 (19:16 +0000)]
am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev

* commit '87797c056c98eb527c85ccb7b7da33c99093e1bc':
  Add UUID for Pbap client

9 years agoam 9ae44f92: am 710e20d2: Merge "Relax access on deprecated fields for compatibility...
Ihab Awad [Mon, 8 Dec 2014 19:16:31 +0000 (19:16 +0000)]
am 9ae44f92: am 710e20d2: Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev

* commit '9ae44f927d678ae4b38259be2ce0601aa215e3b1':
  Relax access on deprecated fields for compatibility.

9 years agoam 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev
Dan Sandler [Mon, 8 Dec 2014 19:16:26 +0000 (19:16 +0000)]
am 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev

* commit '9e3adb821bef924cac5fb21f1e6c539495f3e831':
  RTL support for Lollipop Land.

9 years agoam fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev
Fyodor Kupolov [Mon, 8 Dec 2014 19:16:12 +0000 (19:16 +0000)]
am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev

* commit 'fed2812dc9fd717a7e3b1ebf9c602eda2bdfca08':
  Added isRemovingAdmin method

9 years agoam 50734b70: am 43606641: Merge "Correct check of is user running" into lmp-mr1-dev
Amith Yamasani [Mon, 8 Dec 2014 19:16:02 +0000 (19:16 +0000)]
am 50734b70: am 43606641: Merge "Correct check of is user running" into lmp-mr1-dev

* commit '50734b700974bda5d955e61a8ae61e308a4dc8ad':
  Correct check of is user running

9 years agoam 695b5d25: am 0752da22: Merge "add system|signature protection to android.permissio...
Cheuksan Wang [Mon, 8 Dec 2014 19:15:57 +0000 (19:15 +0000)]
am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev

* commit '695b5d25879e894d381e95017b9ce5166adbb09f':
  add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE

9 years agoam b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile...
Amith Yamasani [Mon, 8 Dec 2014 19:15:50 +0000 (19:15 +0000)]
am b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev

* commit 'b2905092d6779349834635c6343556017c0c998e':
  Potential fix for accidental deactivation of profile owner

9 years agoam 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup when mutate...
ztenghui [Mon, 8 Dec 2014 19:15:36 +0000 (19:15 +0000)]
am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev

* commit '971fe6d66419065b96b46a20b7110ba435fa3a9a':
  AVD: Deep copy the animator target setup when mutate.

9 years agoam fb569013: am ffbb52d0: am 89d30bbc: am 9c40e80a: am c85fa8f1: Merge "Updating...
Clare Bayley [Mon, 8 Dec 2014 19:15:26 +0000 (19:15 +0000)]
am fb569013: am ffbb52d0: am 89d30bbc: am 9c40e80a: am c85fa8f1: Merge "Updating screenshots to LMP release and N6" into lmp-docs

* commit 'fb569013c2b34acb58adc956a12c0f2581028e33':
  Updating screenshots to LMP release and N6

9 years agoam e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserServic...
RoboErik [Mon, 8 Dec 2014 19:15:18 +0000 (19:15 +0000)]
am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev

* commit 'e9905bd489cd6fcb75203b97a3a7d60b95329a6a':
  Make setting the session token in MediaBrowserService synchronous

9 years agoam 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts...
Dan Sandler [Mon, 8 Dec 2014 19:15:06 +0000 (19:15 +0000)]
am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev

* commit '2f6d30dfe60826027af9b59d80c536e8f424545d':
  Don't forget to listen for USER_ALL broadcasts.

9 years agoam 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connect...
Benjamin Franz [Mon, 8 Dec 2014 19:14:56 +0000 (19:14 +0000)]
am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev

* commit '5f1ea2e68b138316f2a56d0a1de382ac47f7b11c':
  Change the routing path of bluetooth headset connections.

9 years agoam 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all...
Justin Harrison [Mon, 8 Dec 2014 19:14:38 +0000 (19:14 +0000)]
am 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev

* commit '66351d623acfe67033c605cce4a5d52faab3fb96':
  Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.

9 years agoam 1a7bac35: am c8640fca: Merge "Add 8 more scripts to the font fallback chain."...
Raph Levien [Mon, 8 Dec 2014 19:14:32 +0000 (19:14 +0000)]
am 1a7bac35: am c8640fca: Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev

* commit '1a7bac35da420bbdf2ed7c2220ad0058abf4d091':
  Add 8 more scripts to the font fallback chain.

9 years agoam bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crash...
Dongwon Kang [Mon, 8 Dec 2014 19:14:20 +0000 (19:14 +0000)]
am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev

* commit 'bfc9739b1c1d57f388a8be62e99f3592f08ad9b3':
  TIF: handle a race condition when a session is crashed

9 years agoam 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune operation...
Dongwon Kang [Mon, 8 Dec 2014 19:14:14 +0000 (19:14 +0000)]
am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev

* commit '91d6f185d3c9109ed21956df7d8fd9501ccf1f6c':
  TIF: increase the time threshold for tune operation which was too harsh

9 years agoam f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch...
Filip Gruszczynski [Mon, 8 Dec 2014 19:13:39 +0000 (19:13 +0000)]
am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev

* commit 'f5d1cf0b194147fae0aca2c2352b4843627ffc1e':
  Private Window flag to disable touch events in WallpaperService.

9 years agoam 2ca0f49d: am 53966f62: am 8242ae16: am dddc2981: am 1782e526: Merge "Revert "docs...
Ricardo Cervera-Navarro [Mon, 8 Dec 2014 19:13:33 +0000 (19:13 +0000)]
am 2ca0f49d: am 53966f62: am 8242ae16: am dddc2981: am 1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs

* commit '2ca0f49d7e9820699a022135101953313d666d0f':
  Revert "docs: Long press to dismiss fix by Wayne"

9 years agoam 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev
Raph Levien [Mon, 8 Dec 2014 19:13:14 +0000 (19:13 +0000)]
am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev

* commit '8aa97d26e48cb86398e3f7df8103379564f16082':
  Change Linkify leniency to VALID

9 years agoam 859fba1d: am fa53c934: Merge "Use TelecomManager to call TelephonyManager#getVoice...
Nancy Chen [Mon, 8 Dec 2014 19:13:06 +0000 (19:13 +0000)]
am 859fba1d: am fa53c934: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)" into lmp-mr1-dev

* commit '859fba1def4ed680cfbd189621c1ae557c2cab9a':
  Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)

9 years agoam 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important process...
Dianne Hackborn [Mon, 8 Dec 2014 19:12:47 +0000 (19:12 +0000)]
am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev

* commit '3cb6496b6c8bb48d458c46e7a062228f0488307d':
  Fix issue #18593636: Turn on "kill important processes that...

9 years agoam 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs
Alan Viverette [Mon, 8 Dec 2014 19:12:32 +0000 (19:12 +0000)]
am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs

* commit '108e539495edb2bfc0d1a3a2cb0879583561bed6':
  Avoid extra saveLayer calls in RippleDrawable, fix docs

9 years agoam ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched.
Svetoslav [Mon, 8 Dec 2014 19:12:22 +0000 (19:12 +0000)]
am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched.

* commit 'ed068f7c3047b3775647a6023c6960a4fc535144':
  Ensure all events from a showing window are dispatched.

9 years agoam 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates...
Lajos Molnar [Mon, 8 Dec 2014 19:12:07 +0000 (19:12 +0000)]
am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev

* commit '2b6dc199432a574d8655734865b0d75d2140fd8c':
  media: allow full range of Vorbis sampling rates

9 years agoam d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands on the new...
Jinsuk Kim [Mon, 8 Dec 2014 19:11:58 +0000 (19:11 +0000)]
am d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands on the new device discovery." into lmp-mr1-dev

* commit 'd1133ba8855199b34c22b369f34c987a14c68b85':
  CEC: Introduce the retry for commands on the new device discovery.

9 years agoam 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into lmp-mr1-dev
Dianne Hackborn [Mon, 8 Dec 2014 19:11:51 +0000 (19:11 +0000)]
am 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into lmp-mr1-dev

* commit '7ca6cc75e32437594bfa53c6f2ca14156c44eb17':
  Add test for isolated services.

9 years agoam 4d1e20a2: am f90b2e5d: Merge "docs: Fix typo, use --> user" into lmp-mr1-dev
Nick Chalko [Mon, 8 Dec 2014 19:11:45 +0000 (19:11 +0000)]
am 4d1e20a2: am f90b2e5d: Merge "docs: Fix typo, use --> user" into lmp-mr1-dev

* commit '4d1e20a24765711c2767cbab0a7077ca538c838e':
  docs: Fix typo, use --> user

9 years agoam b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev
Chet Haase [Mon, 8 Dec 2014 19:11:33 +0000 (19:11 +0000)]
am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev

* commit 'b29c6299704ffd3885be6347bf85058010e24868':
  Fix seeking behavior

9 years agoam f6b890e4: am ac76a16d: am ae80fd42: am f5aa6752: am 709df4fa: Merge "docs: Fixes...
Joe Fernandez [Mon, 8 Dec 2014 19:10:07 +0000 (19:10 +0000)]
am f6b890e4: am ac76a16d: am ae80fd42: am f5aa6752: am 709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs

* commit 'f6b890e448e369c506c0ed57a336ce3f6429b940':
  docs: Fixes for App Indexing training class

9 years agoam 37579034: am fded024a: am 0e597e92: am 9b5de582: am daab7426: Merge "docs: Update...
Luan Nguyen [Mon, 8 Dec 2014 19:09:59 +0000 (19:09 +0000)]
am 37579034: am fded024a: am 0e597e92: am 9b5de582: am daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs

* commit '37579034a14d6442f0765e45b571a20dbcdcb83e':
  docs: Update MessageAPI notes to mention the unreliable transmission nature.

9 years agoam a0ce7116: am 4de95d71: am cc10c02b: am 6c59abc9: am 9db37264: Merge "update L...
smain@google.com [Mon, 8 Dec 2014 19:09:53 +0000 (19:09 +0000)]
am a0ce7116: am 4de95d71: am cc10c02b: am 6c59abc9: am 9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs

* commit 'a0ce71166198a6ebf337b7e2439a3db79b7d9ad6':
  update L Preview message and disallow crawling /preview

9 years agoam 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into...
Zhentao Sun [Mon, 8 Dec 2014 19:09:36 +0000 (19:09 +0000)]
am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev

* commit '4f04cb20cc37d7a70c2a50af97cc6fd6d064bb06':
  Fixed a leak in GeofenceHardwareImpl.java.

9 years agoam 8de4fb2f: am 2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" into lmp...
Raph Levien [Mon, 8 Dec 2014 19:09:18 +0000 (19:09 +0000)]
am 8de4fb2f: am 2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev

* commit '8de4fb2fe53ed7707500d9cdf737953bed3dec7e':
  Fix off-by-one error in computeEllipsis

9 years agoam 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev
Jason Monk [Mon, 8 Dec 2014 19:09:10 +0000 (19:09 +0000)]
am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev

* commit '85d61aaa1a441efd1c1eba2e30742552fa34a0d6':
  Make CarrierText handle multi-sim

9 years agoam 8510d014: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Dec 2014 14:40:37 +0000 (14:40 +0000)]
am 8510d014: (-s ours) Import translations. DO NOT MERGE

* commit '8510d0142c888eb4b968ba1b07824b398efb1792':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Dec 2014 14:32:08 +0000 (06:32 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ifb7d25104a21beffd196b8d73d3c6c20e3800f9f
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Dec 2014 14:28:24 +0000 (06:28 -0800)]
Import translations. DO NOT MERGE

Change-Id: I50002c9d6b9e684be9f69dab0c8318226cbda6b9
Auto-generated-cl: translation import

9 years agoam c5c93edd: Merge "When switching to default USB function set, check restriction...
Zoltan Szatmary-Ban [Mon, 8 Dec 2014 12:55:54 +0000 (12:55 +0000)]
am c5c93edd: Merge "When switching to default USB function set, check restriction" into lmp-mr1-dev

* commit 'c5c93edd9354e956d9b0a4d85fc8372907e2b011':
  When switching to default USB function set, check restriction

9 years agoMerge "When switching to default USB function set, check restriction" into lmp-mr1-dev
Zoltan Szatmary-Ban [Mon, 8 Dec 2014 12:50:22 +0000 (12:50 +0000)]
Merge "When switching to default USB function set, check restriction" into lmp-mr1-dev

9 years agoam 15556bbb: Merge "CEC: Disable debug logging" into lmp-mr1-dev
Jinsuk Kim [Mon, 8 Dec 2014 11:09:00 +0000 (11:09 +0000)]
am 15556bbb: Merge "CEC: Disable debug logging" into lmp-mr1-dev

* commit '15556bbb4f873103f9bb911351389ee6c3295fea':
  CEC: Disable debug logging

9 years agoMerge "CEC: Disable debug logging" into lmp-mr1-dev
Jinsuk Kim [Mon, 8 Dec 2014 11:02:27 +0000 (11:02 +0000)]
Merge "CEC: Disable debug logging" into lmp-mr1-dev