OSDN Git Service

android-x86/frameworks-base.git
9 years agoam ec3f3244: am 33697d85: am 78a73577: Merge "CEC: Update CEC device info properly...
Jinsuk Kim [Tue, 9 Dec 2014 22:22:52 +0000 (22:22 +0000)]
am ec3f3244: am 33697d85: am 78a73577: Merge "CEC: Update CEC device info properly" into lmp-mr1-dev

* commit 'ec3f3244ae5b995fa981a216da3c21d387fb050a':
  CEC: Update CEC device info properly

9 years agoam 6e5522ca: (-s ours) am a551f6c8: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Tue, 9 Dec 2014 22:22:48 +0000 (22:22 +0000)]
am 6e5522ca: (-s ours) am a551f6c8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '6e5522ca814d1bd0882b57bbe5abe9c0af413bc6':
  Import translations. DO NOT MERGE

9 years agoam 18446cb1: (-s ours) am b266393e: (-s ours) am b9f245d4: (-s ours) Merge "Import...
Geoff Mendal [Tue, 9 Dec 2014 22:22:36 +0000 (22:22 +0000)]
am 18446cb1: (-s ours) am b266393e: (-s ours) am b9f245d4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '18446cb185ba29a300c0d3d7a20b86a318c2939f':
  Import translations. DO NOT MERGE

9 years agoam d3eee336: am 15a8a153: am 32eb928c: Merge "QS Wifi panel show icon on secure netwo...
Jason Monk [Tue, 9 Dec 2014 22:22:31 +0000 (22:22 +0000)]
am d3eee336: am 15a8a153: am 32eb928c: Merge "QS Wifi panel show icon on secure networks" into lmp-mr1-dev

* commit 'd3eee336d68bf44aba42a834bdf76a8fa1c8f5e8':
  QS Wifi panel show icon on secure networks

9 years agoam c34118a7: (-s ours) am 9c00c3d5: (-s ours) am 8510d014: (-s ours) Import translati...
Geoff Mendal [Tue, 9 Dec 2014 22:22:26 +0000 (22:22 +0000)]
am c34118a7: (-s ours) am 9c00c3d5: (-s ours) am 8510d014: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam f10f2f47: (-s ours) am e734a86b: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 9 Dec 2014 22:22:22 +0000 (22:22 +0000)]
am f10f2f47: (-s ours) am e734a86b: (-s ours) Import translations. DO NOT MERGE

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

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

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

9 years agoam 4fffb748: am 0cc53a5b: am 15556bbb: Merge "CEC: Disable debug logging" into lmp...
Jinsuk Kim [Tue, 9 Dec 2014 22:22:13 +0000 (22:22 +0000)]
am 4fffb748: am 0cc53a5b: am 15556bbb: Merge "CEC: Disable debug logging" into lmp-mr1-dev

* commit '4fffb7484755e3599099aacd9771b0b4e080242c':
  CEC: Disable debug logging

9 years agoresolved conflicts for merge of c137d08c to master
smain@google.com [Tue, 9 Dec 2014 22:19:57 +0000 (14:19 -0800)]
resolved conflicts for merge of c137d08c to master

Change-Id: I1addaa7b46e893014eca23746c6bf5f7e71dc2ca

9 years agoresolved conflicts for merge of 132004f8 to master
smain@google.com [Tue, 9 Dec 2014 22:14:11 +0000 (14:14 -0800)]
resolved conflicts for merge of 132004f8 to master

Change-Id: I35c6ef810daf2b1329c46798fe6c7e6f2c1dfc82

9 years agoam dbb636fc: (-s ours) am befef081: am 2b4bd09c: am d9c08bac: am 895ab42f: am 59a3dd7...
smain@google.com [Tue, 9 Dec 2014 22:09:30 +0000 (22:09 +0000)]
am dbb636fc: (-s ours) 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 'dbb636fc5355d63f0c3348dbb88e27c6f0ae4c5c':
  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 agoMerge "resolved conflicts for merge of 66189de6 to master"
Joe Fernandez [Tue, 9 Dec 2014 21:59:52 +0000 (21:59 +0000)]
Merge "resolved conflicts for merge of 66189de6 to master"

9 years agoresolved conflicts for merge of 66189de6 to master
Joe Fernandez [Tue, 9 Dec 2014 21:58:23 +0000 (13:58 -0800)]
resolved conflicts for merge of 66189de6 to master

Change-Id: Id4a80013dd506bd1135dd931450ee2a08a4c77aa

9 years agoam 6310c323: am 42b65c6e: am 4ec024e9: am 71319f28: am 160e7607: am dee9e37e: Merge...
smain@google.com [Tue, 9 Dec 2014 20:21:52 +0000 (20:21 +0000)]
am 6310c323: am 42b65c6e: am 4ec024e9: am 71319f28: am 160e7607: am dee9e37e: Merge "add studio 1.0 files and reorder features list" into lmp-docs

* commit '6310c32386b053fe25a8e2c11354de65681088b3':
  add studio 1.0 files and reorder features list

9 years agoresolved conflicts for merge of dda0cb9f to master
Joe Fernandez [Tue, 9 Dec 2014 20:12:24 +0000 (12:12 -0800)]
resolved conflicts for merge of dda0cb9f to master

Change-Id: Id649a91b403f0b6c077ada1c11495657ddc6d181

9 years agoam 7e5fbc1d: am 8804b2a6: am 4e0575be: am c10acd71: am 9a041f18: am d3c9f2b9: update...
smain@google.com [Tue, 9 Dec 2014 14:52:16 +0000 (14:52 +0000)]
am 7e5fbc1d: am 8804b2a6: am 4e0575be: am c10acd71: am 9a041f18: am d3c9f2b9: update studio hero image and add section about code editor [CP]

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

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

* commit '85f69e0b96844551157db7051c0d98c43c5d7b4a':
  docs:build system updates [CP]

9 years agoam 48590173: (-s ours) am 8e29e218: am acd40aa9: am 67fa34e9: am 2d0cf342: am d0c79c4...
smain@google.com [Tue, 9 Dec 2014 14:52:07 +0000 (14:52 +0000)]
am 48590173: (-s ours) am 8e29e218: am acd40aa9: am 67fa34e9: am 2d0cf342: am d0c79c4e: fix migrate guide and other studio edits [CP]

* commit '485901732ecbb549109de1a496058c987c9a8647':
  fix migrate guide and other studio edits [CP]

9 years agoam ae3a1d70: (-s ours) am 8dac5b5e: am fedf3943: am c493dd3f: am e9f63a0f: am 5797e27...
smain@google.com [Tue, 9 Dec 2014 14:45:33 +0000 (14:45 +0000)]
am ae3a1d70: (-s ours) am 8dac5b5e: am fedf3943: am c493dd3f: am e9f63a0f: am 5797e272: docs:sdk installing file update [CP]

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

9 years agoam 283a2046: (-s ours) am c5d38e73: am baa56314: am f0eee644: am 521d7277: am 29e13c5...
smain@google.com [Tue, 9 Dec 2014 14:39:03 +0000 (14:39 +0000)]
am 283a2046: (-s ours) am c5d38e73: am baa56314: am f0eee644: am 521d7277: am 29e13c5a: new Android Studio download page [CP]

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

9 years agoam b2b89de6: (-s ours) am d0a96b67: am cd13e657: am ca61ce33: am e1136835: am 5d9d761...
Rich Slogar [Tue, 9 Dec 2014 14:29:39 +0000 (14:29 +0000)]
am b2b89de6: (-s ours) am d0a96b67: am cd13e657: am ca61ce33: am e1136835: am 5d9d7610: docs: publishing with studio [CP]

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

9 years agoam 2153969c: (-s ours) am d1ffd1e3: am 139c7def: am 53513e9e: am 5962474c: am fc64b70...
smain@google.com [Tue, 9 Dec 2014 13:57:58 +0000 (13:57 +0000)]
am 2153969c: (-s ours) am d1ffd1e3: am 139c7def: am 53513e9e: am 5962474c: am fc64b70a: docs: new Eclipse menu [CP]

* commit '2153969c199ecda6ff4f19bf2d6a34a9bbbe8a59':
  docs: new Eclipse menu [CP]

9 years agoam 3d368a16: (-s ours) am 2e3daaa6: am 6bbb5ed1: am 43304cfc: am 9e6ad10b: am e3fe938...
Rich Slogar [Tue, 9 Dec 2014 13:38:23 +0000 (13:38 +0000)]
am 3d368a16: (-s ours) am 2e3daaa6: am 6bbb5ed1: am 43304cfc: am 9e6ad10b: am e3fe9382: docs: studio basics v2 [CP]

* commit '3d368a16d8bb7849abd36ba9b337a6576040111d':
  docs: studio basics v2 [CP]

9 years agoam a5155276: (-s ours) am e20c9496: am 0b52c5b3: am 88546c85: am 47a19d5d: am fdeb27f...
Rich Slogar [Tue, 9 Dec 2014 13:21:38 +0000 (13:21 +0000)]
am a5155276: (-s ours) am e20c9496: am 0b52c5b3: am 88546c85: am 47a19d5d: am fdeb27f9: docs:download updates for studio [CP]

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

9 years agoam da5184e2: (-s ours) am 7593c6ce: am bcb57c70: am 05d1ba69: am 84f7d62b: am 153c828...
Rich Slogar [Tue, 9 Dec 2014 11:30:05 +0000 (11:30 +0000)]
am da5184e2: (-s ours) am 7593c6ce: am bcb57c70: am 05d1ba69: am 84f7d62b: am 153c8287: docs:revision updates

* commit 'da5184e2dc44b04fb54619b487e56f8b9bdb8638':
  docs:revision updates

9 years agoMerge "Add UtteranceProgressListener#onStop callback"
Przemyslaw Szczepaniak [Tue, 9 Dec 2014 11:13:42 +0000 (11:13 +0000)]
Merge "Add UtteranceProgressListener#onStop callback"

9 years agoam a565716a: am 14965d0e: am 2abd2dd1: Merge "TIF: TvInputHardwareManager to listen...
Wonsik Kim [Tue, 9 Dec 2014 11:06:16 +0000 (11:06 +0000)]
am a565716a: am 14965d0e: am 2abd2dd1: Merge "TIF: TvInputHardwareManager to listen to volume changes" into lmp-mr1-dev

* commit 'a565716a2a26c7522dabfb28f646508cc1928053':
  TIF: TvInputHardwareManager to listen to volume changes

9 years agoam 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handl...
Jean-Michel Trivi [Tue, 9 Dec 2014 11:06:11 +0000 (11:06 +0000)]
am 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev

* commit '83d0c86b869fe84b3172028a5598ebd87ce7745b':
  Support collaborative audio focus handling

9 years agoam 458a3b8a: am 1ce435cb: am 13a69707: am 1e51b3ae: am 14864414: am f7f20a45: docs...
Rich Slogar [Tue, 9 Dec 2014 11:06:07 +0000 (11:06 +0000)]
am 458a3b8a: am 1ce435cb: am 13a69707: am 1e51b3ae: am 14864414: am f7f20a45: docs:building your first app [CP]

* commit '458a3b8afdd0f152902d4930f9fa22bf226b6227':
  docs:building your first app [CP]

9 years agoAdd UtteranceProgressListener#onStop callback
Przemyslaw Szczepaniak [Wed, 19 Nov 2014 17:36:57 +0000 (17:36 +0000)]
Add UtteranceProgressListener#onStop callback

New UtteranceProgressListener callback that allows
to detect a call to TextToSpeech#stop() (or QUEUE_FLUSH usage)
from the same client, or a QUEUE_DESTROY usage from any other
client (Talkback uses it to preempt other users of TextToSpeech
queue). This change is required for seamless Books read aloud
feature+Talkback usage.

+ Fixes for broken tests/TtsTests

Bug: 17901521

Change-Id: I30d2f297bb7c8d05cbeb16f63e85c1be0cca5c84

9 years agoam 6eef2c3a: am 6d3b6ff4: am fe3aabda: am bb642586: am 9fd7804b: am 377604af: docs...
smain@google.com [Tue, 9 Dec 2014 11:06:02 +0000 (11:06 +0000)]
am 6eef2c3a: am 6d3b6ff4: am fe3aabda: am bb642586: am 9fd7804b: am 377604af: docs: project updates [CP]

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

9 years agoam 7e6713fc: am 13b29519: am 382040d4: am 5b2cac58: am f5fa25ec: am 9dd6a07f: docs...
smain@google.com [Tue, 9 Dec 2014 11:05:56 +0000 (11:05 +0000)]
am 7e6713fc: am 13b29519: am 382040d4: am 5b2cac58: am f5fa25ec: am 9dd6a07f: docs: setup-virtual-device [CP]

* commit '7e6713fc080d70721cd33d088f23fa66afcde12f':
  docs: setup-virtual-device [CP]

9 years agoam b5c81893: am bc683297: am 70d5341c: am 5b440be7: am d4c89098: am f592a587: docs...
Rich Slogar [Tue, 9 Dec 2014 11:05:51 +0000 (11:05 +0000)]
am b5c81893: am bc683297: am 70d5341c: am 5b440be7: am d4c89098: am f592a587: docs support library updates [CP]

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

9 years agoam cdad9919: am 2bba0c94: am 892577b0: am 86db5b43: am ff88ac5e: am 7a69c2de: docs...
Rich Slogar [Tue, 9 Dec 2014 11:05:44 +0000 (11:05 +0000)]
am cdad9919: am 2bba0c94: am 892577b0: am 86db5b43: am ff88ac5e: am 7a69c2de: docs: debugging studio [CP]

* commit 'cdad9919ced52b1f7bd00ee442ee97e9c0fd397b':
  docs: debugging studio [CP]

9 years agoam 059b6ef3: am 46150b5f: am 51ffc634: am bf96a239: am 5aac6042: am cc4d08b4: docs...
Rich Slogar [Tue, 9 Dec 2014 11:05:39 +0000 (11:05 +0000)]
am 059b6ef3: am 46150b5f: am 51ffc634: am bf96a239: am 5aac6042: am cc4d08b4: docs:setting up hardware devices [CP]

* commit '059b6ef35c90706ba2a37b69f77abff200b97243':
  docs:setting up hardware devices [CP]

9 years agoam 44176d92: am 5da1430e: am a402fa5f: am f26726b1: am 63d5c3e1: am d16db79e: docs...
Rich Slogar [Tue, 9 Dec 2014 11:05:34 +0000 (11:05 +0000)]
am 44176d92: am 5da1430e: am a402fa5f: am f26726b1: am 63d5c3e1: am d16db79e: docs: workflow index [CP]

* commit '44176d92e0b65a9cc88a4a4d3d7b52278a22a73c':
  docs: workflow index [CP]

9 years agoam 0622234b: am 359e5597: am d5b6d08e: am 8fbb3f6e: am cf516099: am 5e8d9a02: docs...
Rich Slogar [Tue, 9 Dec 2014 11:05:29 +0000 (11:05 +0000)]
am 0622234b: am 359e5597: am d5b6d08e: am 8fbb3f6e: am cf516099: am 5e8d9a02: docs: tools help update [CP]

* commit '0622234bcc5ec27d3f57b674f98f607c101d9f4a':
  docs: tools help update [CP]

9 years agoam 46f7dcf1: (-s ours) am 43883b11: am 044a7802: am 4bc2c3bd: am 1efca60b: am e829d8f...
Scott Rowe [Tue, 9 Dec 2014 11:05:24 +0000 (11:05 +0000)]
am 46f7dcf1: (-s ours) am 43883b11: am 044a7802: am 4bc2c3bd: am 1efca60b: am e829d8fc: docs: Training refactor for Android Studio [CP]

* commit '46f7dcf1e41c1f4fa8477b184dd3d775070220a0':
  docs: Training refactor for Android Studio [CP]

9 years agoMerge "MIDI: API changes to support multiple ports per device"
Mike Lockwood [Tue, 9 Dec 2014 02:37:38 +0000 (02:37 +0000)]
Merge "MIDI: API changes to support multiple ports per device"

9 years agoMIDI: API changes to support multiple ports per device
Mike Lockwood [Mon, 8 Dec 2014 19:19:04 +0000 (11:19 -0800)]
MIDI: API changes to support multiple ports per device

Add MidiInputPort and MidiOutputPort classes (with MidiPort base class)
A MidiDevice can now have multiple input and output ports.
Multiple ports are currently supported only for virtual devices, USB support coming later.

Change-Id: Ib55076aa1374aa46ae4ae76ad93bd717df6d7e21

9 years agoam 62bb43db: am 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode...
Jinsuk Kim [Tue, 9 Dec 2014 01:00:50 +0000 (01:00 +0000)]
am 62bb43db: am 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev

* commit '62bb43dbec930b7a4dc2272d8ed4da73d9aef8b1':
  CEC: Avoid setting op in disabled mode

9 years agoam 587d349e: am cac94aa0: am 06e922fc: am cf528ec7: am d56f55de: am caacc895: Fixes...
David Friedman [Tue, 9 Dec 2014 01:00:45 +0000 (01:00 +0000)]
am 587d349e: am cac94aa0: am 06e922fc: am cf528ec7: am d56f55de: am caacc895: Fixes (updates) download links for NDK r10d.

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

9 years agoam 5550a408: am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant...
Jeff Davidson [Tue, 9 Dec 2014 01:00:40 +0000 (01:00 +0000)]
am 5550a408: am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev

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

9 years agoam 0efd29fc: am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in netwo...
Jeff Davidson [Tue, 9 Dec 2014 01:00:34 +0000 (01:00 +0000)]
am 0efd29fc: am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev

* commit '0efd29fc57c7369e2371aa3226e90f97331f517a':
  Fix flipped captive portal bit in network conditions bcast.

9 years agoam 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug...
Jeff Davidson [Tue, 9 Dec 2014 01:00:29 +0000 (01:00 +0000)]
am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev

* commit '820ba1f96f5917db98df5b5d36cf5f4b32f50f59':
  add disable Ephemeral Network API Bug:18525241

9 years agoam d4753450: am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent...
Jeremy Joslin [Tue, 9 Dec 2014 01:00:09 +0000 (01:00 +0000)]
am d4753450: am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev

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

9 years agoam 1b001cae: am 068a0786: am 59dac0e1: Merge "Associate a UserHandle with each PhoneA...
Evan Charlton [Tue, 9 Dec 2014 01:00:04 +0000 (01:00 +0000)]
am 1b001cae: am 068a0786: am 59dac0e1: Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev

* commit '1b001caed3f2ee150850830dba371f13d61d5512':
  Associate a UserHandle with each PhoneAccountHandle

9 years agoam 446a59bc: am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have...
Paul Jensen [Tue, 9 Dec 2014 01:00:00 +0000 (01:00 +0000)]
am 446a59bc: am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev

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

9 years agoam f062d8d7: am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev
Jeff Tinker [Tue, 9 Dec 2014 00:59:55 +0000 (00:59 +0000)]
am f062d8d7: am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev

* commit 'f062d8d7df6b6ca72f103d133a3483cd91c95c60':
  Unhide secure stop APIs

9 years agoam 5a181a24: am 6fac0351: am b3898fbe: Merge "Talk-back doesn\'t notify user to enter...
Jinsong Mu [Tue, 9 Dec 2014 00:59:45 +0000 (00:59 +0000)]
am 5a181a24: 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 '5a181a2436fb629c2298b9bfb0b2848b514edbe6':
  Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003

9 years agoam 657f25e9: am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for...
Ihab Awad [Tue, 9 Dec 2014 00:59:40 +0000 (00:59 +0000)]
am 657f25e9: am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev

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

9 years agoam ad9e0d5e: am 7823e6ee: am 968ef51c: am c305e6eb: am 860bdc7d: am b357f74e: Merge...
David Friedman [Tue, 9 Dec 2014 00:59:34 +0000 (00:59 +0000)]
am ad9e0d5e: 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 'ad9e0d5ed57d9d32074566e6da400d1a7313236a':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117

9 years agoam b22eea72: am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSess...
RoboErik [Tue, 9 Dec 2014 00:59:30 +0000 (00:59 +0000)]
am b22eea72: am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev

* commit 'b22eea724b4f1d1ccbb1fd7ddd2eb3d9eb3204c8':
  Route mute key events through MediaSessionService

9 years agoam 0d9d5d0a: am e6000f47: am 52fec470: am f7b51977: am 87644a43: am 2b32a042: Merge...
Quddus Chong [Tue, 9 Dec 2014 00:59:23 +0000 (00:59 +0000)]
am 0d9d5d0a: 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 '0d9d5d0a838a5eaea6c5915358ee089b9ae0e45e':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.

9 years agoam a40c6b04: am f428952e: am 9deffecc: am 15c3ce77: am 0dfcfdcb: am 23056929: Merge...
Quddus Chong [Tue, 9 Dec 2014 00:59:17 +0000 (00:59 +0000)]
am a40c6b04: 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 'a40c6b0479c9fbc738aeb04c0cd585d00d6ba9c5':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.

9 years agoam 30b74ccf: am 80d11912: am b503e3f2: Merge "Don\'t destroy surfaces of activities...
Wale Ogunwale [Tue, 9 Dec 2014 00:59:11 +0000 (00:59 +0000)]
am 30b74ccf: am 80d11912: am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev

* commit '30b74ccf69474333e9ec42192fb1b23b3dcc420d':
  Don't destroy surfaces of activities launched behind early.

9 years agoam 73f0e9a3: am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets...
Filip Gruszczynski [Tue, 9 Dec 2014 00:59:06 +0000 (00:59 +0000)]
am 73f0e9a3: am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev

* commit '73f0e9a3feec091f67c9db00ce2d3116b6d91fbd':
  Fix calculation of overscan insets in WindowState.

9 years agoam 0cfdd810: am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items...
Dianne Hackborn [Tue, 9 Dec 2014 00:59:01 +0000 (00:59 +0000)]
am 0cfdd810: am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev

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

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

* commit '4cb33e7657f9adae41fda5fd95c23060f515a238':
  Fine tune the light radius from 800dp to 600dp

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

* commit '17c2719d037bee0823dd90c363cee4716ed43d5b':
  Doing provisioning check for wifi tethering from SystemUI

9 years agoam b71d983a: am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwar...
Eino-Ville Talvala [Tue, 9 Dec 2014 00:19:23 +0000 (00:19 +0000)]
am b71d983a: am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev

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

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

* commit 'cfdc0762e22ec82fa6f6d98abf1d14d5f54ab633':
  Fix docs build

9 years agoam 6b0025ea: am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network...
Stuart Scott [Tue, 9 Dec 2014 00:19:09 +0000 (00:19 +0000)]
am 6b0025ea: am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev

* commit '6b0025ea7ca0e7343ee95bc622261b2f3e86012a':
  Add mapping between RAT and Network Mode

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

* commit '8d50d0fb27c1958dbd047bb8a46d7183d873f131':
  Add checking to find AppDirectedSmsProxy for App Directed SMS feature

9 years agoam d4ba216a: am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze...
Chris Wren [Tue, 9 Dec 2014 00:18:57 +0000 (00:18 +0000)]
am d4ba216a: am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev

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

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

* commit 'a2a5d4d043378b1a7e3630f89f182a32affac27f':
  Correctly parse previous PMBA state during backup

9 years agoam bd2d8202: am a42d95f1: am 8ec2dc00: Merge "Tune delivery and batching of alarms...
Christopher Tate [Tue, 9 Dec 2014 00:18:47 +0000 (00:18 +0000)]
am bd2d8202: am a42d95f1: am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev

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

9 years agoam 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHAN...
Pavel Zhamaitsiak [Tue, 9 Dec 2014 00:18:39 +0000 (00:18 +0000)]
am 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev

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

9 years agoam e0b2fa5c: am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp...
Justin Harrison [Tue, 9 Dec 2014 00:18:35 +0000 (00:18 +0000)]
am e0b2fa5c: am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev

* commit 'e0b2fa5c57c64ffbfebcdcca0b2c96a70cf49983':
  Add UUID for Pbap client

9 years agoam 91fd7728: am 9ae44f92: am 710e20d2: Merge "Relax access on deprecated fields for...
Ihab Awad [Tue, 9 Dec 2014 00:18:30 +0000 (00:18 +0000)]
am 91fd7728: am 9ae44f92: am 710e20d2: Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev

* commit '91fd77283b41e988e6dea0ba02a5994f00b8e1ad':
  Relax access on deprecated fields for compatibility.

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

* commit 'b3014b0f3ae26c5b8e42bee79600a293787866da':
  RTL support for Lollipop Land.

9 years agoam d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into...
Fyodor Kupolov [Tue, 9 Dec 2014 00:18:21 +0000 (00:18 +0000)]
am d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev

* commit 'd483a85e69c3bb83b25473b93806e063b72c9315':
  Added isRemovingAdmin method

9 years agoam 333c4a96: am 50734b70: am 43606641: Merge "Correct check of is user running" into...
Amith Yamasani [Tue, 9 Dec 2014 00:18:16 +0000 (00:18 +0000)]
am 333c4a96: am 50734b70: am 43606641: Merge "Correct check of is user running" into lmp-mr1-dev

* commit '333c4a968edc48d4a0ceb1e82f8f9b520696be8a':
  Correct check of is user running

9 years agoam 673f443f: am 695b5d25: am 0752da22: Merge "add system|signature protection to...
Cheuksan Wang [Tue, 9 Dec 2014 00:18:12 +0000 (00:18 +0000)]
am 673f443f: am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev

* commit '673f443f7e92956399c322b31a14178436fa723b':
  add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE

9 years agoam 81b27f4c: am b2905092: am 0702752c: Merge "Potential fix for accidental deactivati...
Amith Yamasani [Tue, 9 Dec 2014 00:18:07 +0000 (00:18 +0000)]
am 81b27f4c: am b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev

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

9 years agoam 9bb5cef9: am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target...
ztenghui [Tue, 9 Dec 2014 00:18:02 +0000 (00:18 +0000)]
am 9bb5cef9: am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev

* commit '9bb5cef91f82f883a8899dee5fad56111648f1e1':
  AVD: Deep copy the animator target setup when mutate.

9 years agoam 2bfb88ca: am fb569013: am ffbb52d0: am 89d30bbc: am 9c40e80a: am c85fa8f1: Merge...
Clare Bayley [Tue, 9 Dec 2014 00:17:57 +0000 (00:17 +0000)]
am 2bfb88ca: am fb569013: am ffbb52d0: am 89d30bbc: am 9c40e80a: am c85fa8f1: Merge "Updating screenshots to LMP release and N6" into lmp-docs

* commit '2bfb88ca6e84a8fc8d38eb9c4786919cadbbdce3':
  Updating screenshots to LMP release and N6

9 years agoam 0713f944: am e9905bd4: am f58a9091: Merge "Make setting the session token in Media...
RoboErik [Tue, 9 Dec 2014 00:17:53 +0000 (00:17 +0000)]
am 0713f944: am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev

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

9 years agoam c92c94a5: am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL...
Dan Sandler [Tue, 9 Dec 2014 00:17:48 +0000 (00:17 +0000)]
am c92c94a5: am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev

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

9 years agoam f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth...
Benjamin Franz [Tue, 9 Dec 2014 00:17:44 +0000 (00:17 +0000)]
am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev

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

9 years agoam 79e346fe: am 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT...
Justin Harrison [Tue, 9 Dec 2014 00:17:39 +0000 (00:17 +0000)]
am 79e346fe: 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 '79e346fe1bdb4f03e318c9f7ff3b3c7178800413':
  Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.

9 years agoam 72ebd648: am 1a7bac35: am c8640fca: Merge "Add 8 more scripts to the font fallback...
Raph Levien [Tue, 9 Dec 2014 00:17:35 +0000 (00:17 +0000)]
am 72ebd648: am 1a7bac35: am c8640fca: Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev

* commit '72ebd648b790b524a9ba96c924c57193c31b5052':
  Add 8 more scripts to the font fallback chain.

9 years agoam 6077acaf: am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a...
Dongwon Kang [Tue, 9 Dec 2014 00:17:28 +0000 (00:17 +0000)]
am 6077acaf: am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev

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

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

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

9 years agoam 5ae61a81: am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to...
Filip Gruszczynski [Tue, 9 Dec 2014 00:17:18 +0000 (00:17 +0000)]
am 5ae61a81: am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev

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

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

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

9 years agoam 1918d027: am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into...
Raph Levien [Tue, 9 Dec 2014 00:17:09 +0000 (00:17 +0000)]
am 1918d027: am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev

* commit '1918d0276ad502e45944bd75a187dd22021790c5':
  Change Linkify leniency to VALID

9 years agoam 8940955a: am 859fba1d: am fa53c934: Merge "Use TelecomManager to call TelephonyMan...
Nancy Chen [Tue, 9 Dec 2014 00:17:04 +0000 (00:17 +0000)]
am 8940955a: am 859fba1d: am fa53c934: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)" into lmp-mr1-dev

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

9 years agoam 34e7003a: am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill...
Dianne Hackborn [Tue, 9 Dec 2014 00:16:59 +0000 (00:16 +0000)]
am 34e7003a: am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev

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

9 years agoam 5f5e13d0: am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable...
Alan Viverette [Tue, 9 Dec 2014 00:16:54 +0000 (00:16 +0000)]
am 5f5e13d0: am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs

* commit '5f5e13d07fcf7531c0bb61f147732a430ad5aeda':
  Avoid extra saveLayer calls in RippleDrawable, fix docs

9 years agoam f477aeb3: am ed068f7c: am 3a0d878a: Ensure all events from a showing window are...
Svetoslav [Tue, 9 Dec 2014 00:16:48 +0000 (00:16 +0000)]
am f477aeb3: am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched.

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

9 years agoam 967da505: am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampl...
Lajos Molnar [Tue, 9 Dec 2014 00:16:43 +0000 (00:16 +0000)]
am 967da505: am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev

* commit '967da505b2cb96ed85161fd940dbecb467bfe38c':
  media: allow full range of Vorbis sampling rates

9 years agoam 3f771d87: am d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands...
Jinsuk Kim [Tue, 9 Dec 2014 00:16:37 +0000 (00:16 +0000)]
am 3f771d87: am d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands on the new device discovery." into lmp-mr1-dev

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

9 years agoam 7039f6b4: am 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into...
Dianne Hackborn [Tue, 9 Dec 2014 00:16:31 +0000 (00:16 +0000)]
am 7039f6b4: am 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into lmp-mr1-dev

* commit '7039f6b423d2795eea6bebc932c9cb0d8422de88':
  Add test for isolated services.

9 years agoam b7459df4: am 4d1e20a2: am f90b2e5d: Merge "docs: Fix typo, use --> user" into...
Nick Chalko [Tue, 9 Dec 2014 00:16:25 +0000 (00:16 +0000)]
am b7459df4: am 4d1e20a2: am f90b2e5d: Merge "docs: Fix typo, use --> user" into lmp-mr1-dev

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

9 years agoam 0a8cc945: am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev
Chet Haase [Tue, 9 Dec 2014 00:16:20 +0000 (00:16 +0000)]
am 0a8cc945: am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev

* commit '0a8cc945ce92263ae8b66db7d08c224865b34470':
  Fix seeking behavior

9 years agoam 29fb654e: am f6b890e4: am ac76a16d: am ae80fd42: am f5aa6752: am 709df4fa: Merge...
Joe Fernandez [Tue, 9 Dec 2014 00:16:15 +0000 (00:16 +0000)]
am 29fb654e: am f6b890e4: am ac76a16d: am ae80fd42: am f5aa6752: am 709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs

* commit '29fb654ee95a4c11c8db70c7c9c6133a161672f2':
  docs: Fixes for App Indexing training class

9 years agoam 4d1b8b6c: am 37579034: am fded024a: am 0e597e92: am 9b5de582: am daab7426: Merge...
Luan Nguyen [Tue, 9 Dec 2014 00:16:11 +0000 (00:16 +0000)]
am 4d1b8b6c: 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 '4d1b8b6c290973c3f58dd9eb1e164fa8b08d93c0':
  docs: Update MessageAPI notes to mention the unreliable transmission nature.

9 years agoam 1bef46b9: am a0ce7116: am 4de95d71: am cc10c02b: am 6c59abc9: am 9db37264: Merge...
smain@google.com [Tue, 9 Dec 2014 00:16:06 +0000 (00:16 +0000)]
am 1bef46b9: am a0ce7116: am 4de95d71: am cc10c02b: am 6c59abc9: am 9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs

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

9 years agoam b97782f2: am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl...
Zhentao Sun [Tue, 9 Dec 2014 00:16:01 +0000 (00:16 +0000)]
am b97782f2: am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev

* commit 'b97782f2dac9714e4b6037a6d82a259f32816a5a':
  Fixed a leak in GeofenceHardwareImpl.java.