git.osdn.net Git - android-x86/frameworks-base.git/log

Benjamin Franz [Wed, 8 Jul 2015 15:17:12 +0000 (15:17 +0000)]

am 5a9102e3: am 12ceccaf: am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

* commit '5a9102e307f395dec106cd5e0109abf9b0e07d5b':
Clarify javadoc of setPermissionPolicy

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 15:17:06 +0000 (15:17 +0000)]

am 150f3ed6: (-s ours) am 06ed218d: (-s ours) am 5e60e7c1: (-s ours) am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE

* commit '150f3ed6669ba693c1158fa5a45b8356a3975dda':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Benjamin Franz [Wed, 8 Jul 2015 14:47:52 +0000 (14:47 +0000)]

am 12ceccaf: am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

* commit '12ceccaf7aa4198bb578bcba844729c0ac146d6d':
Clarify javadoc of setPermissionPolicy

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 14:47:47 +0000 (14:47 +0000)]

am 06ed218d: (-s ours) am 5e60e7c1: (-s ours) am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE

* commit '06ed218ddcb92e0f5b20bdec70bb65b2c29c04f1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Benjamin Franz [Wed, 8 Jul 2015 14:33:38 +0000 (14:33 +0000)]

am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

* commit '4b7d3b477f4405d5afe7f116e14037ac7c70e414':
Clarify javadoc of setPermissionPolicy

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 14:33:33 +0000 (14:33 +0000)]

am 5e60e7c1: (-s ours) am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE

* commit '5e60e7c1030630f4052fd29982c15fd4ed78ec5e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Benjamin Franz [Wed, 8 Jul 2015 14:18:28 +0000 (14:18 +0000)]

am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

* commit '051762f77d5bf2c0dcbb05786ac5ae81086d596c':
Clarify javadoc of setPermissionPolicy

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 14:18:24 +0000 (14:18 +0000)]

am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Benjamin Franz [Wed, 8 Jul 2015 14:03:46 +0000 (14:03 +0000)]

am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

* commit 'c088e30fd403b9843a00cc311e460734bd111c26':
Clarify javadoc of setPermissionPolicy

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 14:03:42 +0000 (14:03 +0000)]

am 20ad9246: (-s ours) Import translations. DO NOT MERGE

* commit '20ad92460bf180abb1d2a154e8ec007ca2330e6d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Benjamin Franz [Wed, 8 Jul 2015 13:59:29 +0000 (13:59 +0000)]

Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 13:43:44 +0000 (06:43 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Benjamin Franz [Wed, 8 Jul 2015 13:24:14 +0000 (14:24 +0100)]

Clarify javadoc of setPermissionPolicy

Bug: 22192363
Change-Id: I552eae1e84ce866d9873faacb5c261321351915a

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 13:10:26 +0000 (13:10 +0000)]

am 83fbc6f2: am ea199bae: am 116183ac: am 37186001: am e3bb8e43: am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs

* commit '83fbc6f2dfe84f38ed0030de0a2f2fb95021e573':
Doc change -- update trade practices link.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 13:10:19 +0000 (13:10 +0000)]

am 032ba9f3: am 2fbfe429: am 92c1d283: am 706ad39b: am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev

* commit '032ba9f3d1a9edc85ac2e3595f5cedb6d5b27103':
Prevent accidental unlocking of USB data transfer.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 13:10:13 +0000 (13:10 +0000)]

am 55a3a233: am 5bc85aa8: am d426cf73: am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev

* commit '55a3a23307ba1591b95941f7c487c931da505ce0':
Expose time-interval detail query on INetworkStatsSession

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 13:10:06 +0000 (13:10 +0000)]

am 1d34b1ec: am f125efa4: am d9f16aea: am af3c755c: am bc243440: am 590a25a3: am 70f1aadd: Doc change: add version notes for preview 2.

* commit '1d34b1ec0aedbb4e3c6dd587208a691a709d127d':
Doc change: add version notes for preview 2.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 13:09:58 +0000 (13:09 +0000)]

am 1d475de2: am 2358d5c3: am e9233f05: am a626f8d8: am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev

* commit '1d475de2430236c21776040d2b2e17799276328f':
Make StorageMeasurement multiprofile aware.

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 13:09:52 +0000 (13:09 +0000)]

am a0ff9055: am b8c1a523: am 3a821b62: am 77f579f9: am 8ecba862: am 638ecb76: am 773861f0: Merge "Docs: Localized landing pages for M Preview 2 release." into mnc-preview-docs

* commit 'a0ff9055415f868b04d8260338ffc3357a2abd6e':
Docs: Localized landing pages for M Preview 2 release.

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 13:09:44 +0000 (13:09 +0000)]

am 8b65c529: am 4a6ac2c2: am 6042b4ce: am 9a2351c0: am d3967e3f: am 0922b82a: am a7e0bfa6: Docs: Updates to M Preview 2 Download pages.

* commit '8b65c52956e7543d1723e31973235568822f3d09':
Docs: Updates to M Preview 2 Download pages.

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 13:09:37 +0000 (13:09 +0000)]

am 4c2d6d39: am fbf307df: am 5e3c1946: am d63bc307: am a939d7e8: am cb7a3b6b: am 201cfff4: Merge "Docs: Updated download page for M Preview; new archive page for older versions" into mnc-preview-docs

* commit '4c2d6d395a9595f54d7a21d9b769256330685f44':
Docs: Updated download page for M Preview; new archive page for older versions

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 13:09:29 +0000 (13:09 +0000)]

am 92897fe7: am e690eae7: am 0a79ae6f: am 99f5f80e: am f6fd4ef8: am 73ce8abb: am 869050b3: Docs: Updated Preview TOC reflecting the newly localized pages.

* commit '92897fe77ba21ef01df4bef280e8d4a352f703a6':
Docs: Updated Preview TOC reflecting the newly localized pages.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 8 Jul 2015 13:09:22 +0000 (13:09 +0000)]

am e1a08110: am b91f34bf: am 4c90d9ae: am bf291475: am e32f9c88: Merge changes I29f7abe6,I6c831467 into mnc-dev

* commit 'e1a0811044948421c27ccdda9dccfa3aa280dc72':
Fix Paint_Delegate.native_getRunAdvance()
Add a default PackageManager to BridgeContext.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 8 Jul 2015 13:09:15 +0000 (13:09 +0000)]

am 3755f803: am 4279b2a4: am 18a5e88c: am 7e4414f2: am 65d4f7a6: Merge changes Id0595c4b,Ia1a3e8c3 into mnc-dev

* commit '3755f803b92f53eeff44a0aee9c49aec02644060':
Revert "Replace infinite loop with foreach."
Update intellij project for tools-common sources.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 8 Jul 2015 13:09:08 +0000 (13:09 +0000)]

am d2f5223f: am 4cdf77a5: am 8ff5a95a: am d6072387: am a4546b0e: Merge "Implement tools:list_item for RecyclerView." into mnc-dev

* commit 'd2f5223ff711eb4a9e0c320e089571d6586441fc':
Implement tools:list_item for RecyclerView.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 8 Jul 2015 13:09:00 +0000 (13:09 +0000)]

am 07e8b992: am 67e18486: am c3c3b92c: am 12c05a24: am 0c784ffa: Merge "Add roundess to configuration" into mnc-dev

* commit '07e8b992299f796fd6dd1601f1675b7e7b62c8b4':
Add roundess to configuration

commit | commitdiff | tree

Deepanshu Gupta [Wed, 8 Jul 2015 13:08:53 +0000 (13:08 +0000)]

am c7130fd9: am a74a2aff: am 90a95072: am 71645fd8: am 1629717f: Merge "Update tests per new layoutlib_api" into mnc-dev

* commit 'c7130fd920841c88f451b8c3b863e5df7f054142':
Update tests per new layoutlib_api

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 13:08:46 +0000 (13:08 +0000)]

am 74641bc8: am 5350e31d: am 08ac92be: am d327c547: am 8d6f6606: am 64e3997a: am 97dcc6fd: Docs: Remaining L10N for M Preview pages (ru).

* commit '74641bc8344c2de0ac6b386e2424c0db5ba268b0':
Docs: Remaining L10N for M Preview pages (ru).

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 13:08:38 +0000 (13:08 +0000)]

am 4c593845: am 99e2499a: am bd68b00a: am 095c55a4: am 743748b1: am baa723c2: am 14592ef0: Merge "Docs: L10N for remaining M Preview docs (pt-br)." into mnc-preview-docs

* commit '4c593845ffe24488b0c24a04858a161a5e7343fc':
Docs: L10N for remaining M Preview docs (pt-br).

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 13:08:30 +0000 (13:08 +0000)]

am 3536e29e: am f3c0cdb5: am 43a57790: am 741a9b1e: am 4ff73b4a: am 1937867b: am 858ef9ab: Docs: L10N of the remaining M-preview pages (es-la)

* commit '3536e29ead088b2472181d79f65688498752dd75':
Docs: L10N of the remaining M-preview pages (es-la)

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 13:08:23 +0000 (13:08 +0000)]

am d17ddd36: am 00fe78c7: am 1a4e32dd: am acd7eb98: am 68c22cd1: am 73fde03a: am d6473b0f: Merge "Docs: L10N of remaining M-Preview docs (zh-tw)" into mnc-preview-docs

* commit 'd17ddd3670dcbafd37325e1006400e96dee17d07':
Docs: L10N of remaining M-Preview docs (zh-tw)

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 13:08:15 +0000 (13:08 +0000)]

am 6ac0b8ad: am e379f91a: am 07fd81b8: am 213083c8: am e6e821d6: am 3c6c05fc: am 4e1d42f9: Merge "Docs: L10N of remaining M Preview pages for zh-cn" into mnc-preview-docs

* commit '6ac0b8ad413688c29092b7a696ab47bd02eb7a5f':
Docs: L10N of remaining M Preview pages for zh-cn

commit | commitdiff | tree

Etan Cohen [Wed, 8 Jul 2015 13:08:08 +0000 (13:08 +0000)]

am a8c58435: am e62c69ee: am 7fc77e60: am d453d7e4: am 3e639057: Merge "Add ACCESS_IMS_CALL_SERVICE hidden permission." into mnc-dev

* commit 'a8c5843591ab3f7cc1f62c5b1396ea38e506c140':
Add ACCESS_IMS_CALL_SERVICE hidden permission.

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 13:07:59 +0000 (13:07 +0000)]

am e4111d6b: am e10c3528: am 591d69b0: am 00c3d94d: am ebfe2be1: am 3f83aa3f: am 4da25c2e: Docs: L10N of remaining M Preview docs (ko).

* commit 'e4111d6b6d69ce9de1702c21728185e59a6cc76f':
Docs: L10N of remaining M Preview docs (ko).

commit | commitdiff | tree

Wale Ogunwale [Wed, 8 Jul 2015 13:07:51 +0000 (13:07 +0000)]

am efe8d59c: am d32a235d: am 8c58c318: am fe8426a3: am 06bdab9b: Merge "Set AppErrorDialog result during dismissal if it isn\'t already set" into mnc-dev

* commit 'efe8d59cd049c7d2d12372440d682aa9ea04aa07':
Set AppErrorDialog result during dismissal if it isn't already set

commit | commitdiff | tree

Seigo Nonaka [Wed, 8 Jul 2015 13:07:43 +0000 (13:07 +0000)]

am 97db8395: am ec99c3e1: am 3340da0e: am ee83bc75: am 9d3cd848: Merge "Add libhidcommand_jni.so to required module." into mnc-dev

* commit '97db8395cd352b6ac89c5091027602eeaba100c0':
Add libhidcommand_jni.so to required module.

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 12:55:30 +0000 (12:55 +0000)]

am ea199bae: am 116183ac: am 37186001: am e3bb8e43: am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs

* commit 'ea199baedbe098e7abbbc152cd40dc5949b4c1ab':
Doc change -- update trade practices link.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:55:25 +0000 (12:55 +0000)]

am 2fbfe429: am 92c1d283: am 706ad39b: am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev

* commit '2fbfe42955520c6831fd5df94d87ada875f9299b':
Prevent accidental unlocking of USB data transfer.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:55:18 +0000 (12:55 +0000)]

am 5bc85aa8: am d426cf73: am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev

* commit '5bc85aa8dbfdf03a5e764e74c415189c1bfa591c':
Expose time-interval detail query on INetworkStatsSession

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 12:55:04 +0000 (12:55 +0000)]

am f125efa4: am d9f16aea: am af3c755c: am bc243440: am 590a25a3: am 70f1aadd: Doc change: add version notes for preview 2.

* commit 'f125efa4d8bb5d165c03a2cc6eea4396cf98d693':
Doc change: add version notes for preview 2.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:54:58 +0000 (12:54 +0000)]

am 2358d5c3: am e9233f05: am a626f8d8: am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev

* commit '2358d5c3af6b350028eda483af2944570182f348':
Make StorageMeasurement multiprofile aware.

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 12:54:51 +0000 (12:54 +0000)]

am b8c1a523: am 3a821b62: am 77f579f9: am 8ecba862: am 638ecb76: am 773861f0: Merge "Docs: Localized landing pages for M Preview 2 release." into mnc-preview-docs

* commit 'b8c1a523e4d68c91e47be333528c826baf8a5f5a':
Docs: Localized landing pages for M Preview 2 release.

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 12:54:43 +0000 (12:54 +0000)]

am 4a6ac2c2: am 6042b4ce: am 9a2351c0: am d3967e3f: am 0922b82a: am a7e0bfa6: Docs: Updates to M Preview 2 Download pages.

* commit '4a6ac2c2bf2ec17bab59913af128428d5846cfa9':
Docs: Updates to M Preview 2 Download pages.

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 12:54:32 +0000 (12:54 +0000)]

am fbf307df: am 5e3c1946: am d63bc307: am a939d7e8: am cb7a3b6b: am 201cfff4: Merge "Docs: Updated download page for M Preview; new archive page for older versions" into mnc-preview-docs

* commit 'fbf307dfa5128e9842dbc3db5a8e95ead9304683':
Docs: Updated download page for M Preview; new archive page for older versions

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 12:54:26 +0000 (12:54 +0000)]

am e690eae7: am 0a79ae6f: am 99f5f80e: am f6fd4ef8: am 73ce8abb: am 869050b3: Docs: Updated Preview TOC reflecting the newly localized pages.

* commit 'e690eae7a5479f86bfdf529e391532cf48105c2f':
Docs: Updated Preview TOC reflecting the newly localized pages.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 8 Jul 2015 12:54:19 +0000 (12:54 +0000)]

am b91f34bf: am 4c90d9ae: am bf291475: am e32f9c88: Merge changes I29f7abe6,I6c831467 into mnc-dev

* commit 'b91f34bf7591c42579c4c18de24237aae2ba3154':
Fix Paint_Delegate.native_getRunAdvance()
Add a default PackageManager to BridgeContext.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 8 Jul 2015 12:54:14 +0000 (12:54 +0000)]

am 4279b2a4: am 18a5e88c: am 7e4414f2: am 65d4f7a6: Merge changes Id0595c4b,Ia1a3e8c3 into mnc-dev

* commit '4279b2a486dba9719b96c81000f4717adf302cfc':
Revert "Replace infinite loop with foreach."
Update intellij project for tools-common sources.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 8 Jul 2015 12:54:08 +0000 (12:54 +0000)]

am 4cdf77a5: am 8ff5a95a: am d6072387: am a4546b0e: Merge "Implement tools:list_item for RecyclerView." into mnc-dev

* commit '4cdf77a54b36b05e4d7da4776785027f14c23e90':
Implement tools:list_item for RecyclerView.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 8 Jul 2015 12:54:03 +0000 (12:54 +0000)]

am 67e18486: am c3c3b92c: am 12c05a24: am 0c784ffa: Merge "Add roundess to configuration" into mnc-dev

* commit '67e184862c7533d6e54337f43d197267947b9fb6':
Add roundess to configuration

commit | commitdiff | tree

Deepanshu Gupta [Wed, 8 Jul 2015 12:53:58 +0000 (12:53 +0000)]

am a74a2aff: am 90a95072: am 71645fd8: am 1629717f: Merge "Update tests per new layoutlib_api" into mnc-dev

* commit 'a74a2afff82b5d0cfe6aa312cf76ff9b7cfe5808':
Update tests per new layoutlib_api

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 12:53:51 +0000 (12:53 +0000)]

am 5350e31d: am 08ac92be: am d327c547: am 8d6f6606: am 64e3997a: am 97dcc6fd: Docs: Remaining L10N for M Preview pages (ru).

* commit '5350e31d93a37e83cccc12bde78cb4ff10a64dc4':
Docs: Remaining L10N for M Preview pages (ru).

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 12:53:45 +0000 (12:53 +0000)]

am 99e2499a: am bd68b00a: am 095c55a4: am 743748b1: am baa723c2: am 14592ef0: Merge "Docs: L10N for remaining M Preview docs (pt-br)." into mnc-preview-docs

* commit '99e2499a28ac3fad75609a0097322db88b7825b7':
Docs: L10N for remaining M Preview docs (pt-br).

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 12:53:39 +0000 (12:53 +0000)]

am f3c0cdb5: am 43a57790: am 741a9b1e: am 4ff73b4a: am 1937867b: am 858ef9ab: Docs: L10N of the remaining M-preview pages (es-la)

* commit 'f3c0cdb58b10249657305396c56d9ba9a1ced4a6':
Docs: L10N of the remaining M-preview pages (es-la)

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 12:53:32 +0000 (12:53 +0000)]

am 00fe78c7: am 1a4e32dd: am acd7eb98: am 68c22cd1: am 73fde03a: am d6473b0f: Merge "Docs: L10N of remaining M-Preview docs (zh-tw)" into mnc-preview-docs

* commit '00fe78c7f73f4ad460f31f761e4980055acf5fca':
Docs: L10N of remaining M-Preview docs (zh-tw)

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 12:53:24 +0000 (12:53 +0000)]

am e379f91a: am 07fd81b8: am 213083c8: am e6e821d6: am 3c6c05fc: am 4e1d42f9: Merge "Docs: L10N of remaining M Preview pages for zh-cn" into mnc-preview-docs

* commit 'e379f91aded3e9831c4a0a98f8f8077b3e4b0fb7':
Docs: L10N of remaining M Preview pages for zh-cn

commit | commitdiff | tree

Etan Cohen [Wed, 8 Jul 2015 12:53:19 +0000 (12:53 +0000)]

am e62c69ee: am 7fc77e60: am d453d7e4: am 3e639057: Merge "Add ACCESS_IMS_CALL_SERVICE hidden permission." into mnc-dev

* commit 'e62c69eea34c5ea043a8ee5bc3d8dbb0c227d511':
Add ACCESS_IMS_CALL_SERVICE hidden permission.

commit | commitdiff | tree

David Friedman [Wed, 8 Jul 2015 12:53:12 +0000 (12:53 +0000)]

am e10c3528: am 591d69b0: am 00c3d94d: am ebfe2be1: am 3f83aa3f: am 4da25c2e: Docs: L10N of remaining M Preview docs (ko).

* commit 'e10c3528f788bc0f349187f314a9385e7fb6ce88':
Docs: L10N of remaining M Preview docs (ko).

commit | commitdiff | tree

Wale Ogunwale [Wed, 8 Jul 2015 12:53:04 +0000 (12:53 +0000)]

am d32a235d: am 8c58c318: am fe8426a3: am 06bdab9b: Merge "Set AppErrorDialog result during dismissal if it isn\'t already set" into mnc-dev

* commit 'd32a235dbff1c3c42df75c8710dd6f5a64f269f4':
Set AppErrorDialog result during dismissal if it isn't already set

commit | commitdiff | tree

Seigo Nonaka [Wed, 8 Jul 2015 12:52:58 +0000 (12:52 +0000)]

am ec99c3e1: am 3340da0e: am ee83bc75: am 9d3cd848: Merge "Add libhidcommand_jni.so to required module." into mnc-dev

* commit 'ec99c3e11ec26cb08b6ce0bbd5338bbf8320d1f9':
Add libhidcommand_jni.so to required module.

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:49:31 +0000 (12:49 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:46:22 +0000 (05:46 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:38:16 +0000 (12:38 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:35:41 +0000 (05:35 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:35:12 +0000 (12:35 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:32:41 +0000 (05:32 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:31:40 +0000 (12:31 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:29:52 +0000 (05:29 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:26:35 +0000 (12:26 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 12:25:50 +0000 (12:25 +0000)]

am 116183ac: am 37186001: am e3bb8e43: am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs

* commit '116183ac89ffe253991766819e7eb3f748c67761':
Doc change -- update trade practices link.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:25:43 +0000 (12:25 +0000)]

am 92c1d283: am 706ad39b: am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev

* commit '92c1d2834b4528593c66b64e188f8d556641705e':
Prevent accidental unlocking of USB data transfer.

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:24:40 +0000 (12:24 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:22:50 +0000 (05:22 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:20:53 +0000 (12:20 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:17:38 +0000 (05:17 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:14:50 +0000 (05:14 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 12:12:26 +0000 (12:12 +0000)]

am 37186001: am e3bb8e43: am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs

* commit '3718600180a3496e7570e13dfae6088b89a22e81':
Doc change -- update trade practices link.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:12:22 +0000 (12:12 +0000)]

am 706ad39b: am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev

* commit '706ad39b0a2b8388ab59e4c4cd86dbc65b9cc6cf':
Prevent accidental unlocking of USB data transfer.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:12:17 +0000 (12:12 +0000)]

am d426cf73: am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev

* commit 'd426cf737a2ecf827d0a44e607e2dbfd48c56e59':
Expose time-interval detail query on INetworkStatsSession

commit | commitdiff | tree

Geoff Mendal [Wed, 8 Jul 2015 12:06:55 +0000 (05:06 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:58:14 +0000 (11:58 +0000)]

am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev

* commit '30871415dca603393b05e7fa2aa9013a3360b03d':
Expose time-interval detail query on INetworkStatsSession

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 11:57:29 +0000 (11:57 +0000)]

am e3bb8e43: am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs

* commit 'e3bb8e4306f9f55e5039315c2dddface79ba9bca':
Doc change -- update trade practices link.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:57:25 +0000 (11:57 +0000)]

am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev

* commit 'a2de7fc9fc0b96ba4db65ccf6c9684c8c27c2993':
Prevent accidental unlocking of USB data transfer.

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 11:49:01 +0000 (11:49 +0000)]

am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs

* commit 'cc040d583b121e6a028e2dc47691d3f4f98c6e70':
Doc change -- update trade practices link.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:44:32 +0000 (11:44 +0000)]

Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:44:14 +0000 (11:44 +0000)]

am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev

* commit '895927603606e58a46ecaee8f2244e1e2b6f2840':
Expose time-interval detail query on INetworkStatsSession

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 11:37:48 +0000 (11:37 +0000)]

am d9f16aea: am af3c755c: am bc243440: am 590a25a3: am 70f1aadd: Doc change: add version notes for preview 2.

* commit 'd9f16aeaa360b4ab0f542b20516f232939eccbe2':
Doc change: add version notes for preview 2.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:37:38 +0000 (11:37 +0000)]

am e9233f05: am a626f8d8: am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev

* commit 'e9233f0544a1780ce43e4a01c7409cc8fadb23d7':
Make StorageMeasurement multiprofile aware.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:32:57 +0000 (11:32 +0000)]

Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 11:29:44 +0000 (11:29 +0000)]

am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs

* commit '7e8358c6e5e97dc224be65890564d44a7a043461':
Doc change -- update trade practices link.

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 11:20:41 +0000 (11:20 +0000)]

am af3c755c: am bc243440: am 590a25a3: am 70f1aadd: Doc change: add version notes for preview 2.

* commit 'af3c755c92e1bf66086f36071a8776ed32f9c391':
Doc change: add version notes for preview 2.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:20:37 +0000 (11:20 +0000)]

am a626f8d8: am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev

* commit 'a626f8d854d65609c71f602d79b0360359e5b5b7':
Make StorageMeasurement multiprofile aware.

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 11:15:53 +0000 (11:15 +0000)]

am bc243440: am 590a25a3: am 70f1aadd: Doc change: add version notes for preview 2.

* commit 'bc2434404ef76d3230da376a10f22afa4085f8d6':
Doc change: add version notes for preview 2.

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 11:14:00 +0000 (11:14 +0000)]

Merge "Doc change -- update trade practices link." into mnc-preview-docs

commit | commitdiff | tree

Neil Fuller [Wed, 8 Jul 2015 11:05:13 +0000 (11:05 +0000)]

am 849558b7: am 26e58f09: am b05c2beb: Merge "Move listen() over to using android.system.Os"

* commit '849558b72711e57a06fa4df2d6c5a2294df5d49e':
Move listen() over to using android.system.Os

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:05:12 +0000 (11:05 +0000)]

am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev

* commit '4d2593d3f2ce052de5000ebec28bc99a12dd5497':
Make StorageMeasurement multiprofile aware.

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 11:03:39 +0000 (11:03 +0000)]

am 590a25a3: am 70f1aadd: Doc change: add version notes for preview 2.

* commit '590a25a31367de154bca9556829bc0338cb4ca73':
Doc change: add version notes for preview 2.

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 10:59:06 +0000 (10:59 +0000)]

am 3a821b62: am 77f579f9: am 8ecba862: am 638ecb76: am 773861f0: Merge "Docs: Localized landing pages for M Preview 2 release." into mnc-preview-docs

* commit '3a821b62a6602a07d9726b813a2bf76b3387aea7':
Docs: Localized landing pages for M Preview 2 release.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 8 Jul 2015 10:54:05 +0000 (10:54 +0000)]

Merge "Make StorageMeasurement multiprofile aware." into mnc-dev

commit | commitdiff | tree

Neil Fuller [Wed, 8 Jul 2015 10:50:36 +0000 (10:50 +0000)]

am 26e58f09: am b05c2beb: Merge "Move listen() over to using android.system.Os"

* commit '26e58f09d9c040b8abaa5184a16ec52e5f401b4c':
Move listen() over to using android.system.Os

commit | commitdiff | tree

Dirk Dougherty [Wed, 8 Jul 2015 10:48:53 +0000 (10:48 +0000)]

am 70f1aadd: Doc change: add version notes for preview 2.

* commit '70f1aadd4bc1bfc96ddee08c38a5ac67ae531344':
Doc change: add version notes for preview 2.