OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 5c4fcbbb: am 17cfb5ec: am af5b992c: am 9c2182e1: Merge "Add a dumpsys for Keyguard...
Jason Monk [Tue, 14 Jul 2015 17:16:33 +0000 (17:16 +0000)]
am 5c4fcbbb: am 17cfb5ec: am af5b992c: am 9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev

* commit '5c4fcbbb3fafe325455cc4a0729d234d28d53e16':
  Add a dumpsys for KeyguardUpdateMonitor

9 years agoam b63aa8a9: am 37621e24: am 92573764: am fd186d20: am 28006a3b: am 7182f075: Merge...
Robert Schaub [Tue, 14 Jul 2015 17:16:26 +0000 (17:16 +0000)]
am b63aa8a9: am 37621e24: am 92573764: am fd186d20: am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs

* commit 'b63aa8a99754351aa7b35e9cf5d6fb8a4b167731':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup

9 years agoam c0b73edb: am d0ca9dea: am 695fc97a: am 0b403ebd: am 1962b730: am 3430bec7: Merge...
Robert Schaub [Tue, 14 Jul 2015 17:16:20 +0000 (17:16 +0000)]
am c0b73edb: am d0ca9dea: am 695fc97a: am 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs

* commit 'c0b73edb7bdb808633b7986e7a73e9823454bee1':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing

9 years agoam c2a0d1ed: am cb533c53: am 63bd0587: am 91a44578: am 5c3bf584: am e0f0fabb: am...
David Friedman [Tue, 14 Jul 2015 17:16:14 +0000 (17:16 +0000)]
am c2a0d1ed: am cb533c53: am 63bd0587: am 91a44578: am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs

* commit 'c2a0d1edfb59a9c1dfc0f92aaa7160345ccce2d7':
  docs: replacing command line tool instructions with Studio and Monitor steps

9 years agoam 43838d3f: am 16df17cf: am a29b8fbb: am 908c50a1: am f13e914d: am 8cce3984: Merge...
Eric Gilmore [Tue, 14 Jul 2015 17:16:08 +0000 (17:16 +0000)]
am 43838d3f: am 16df17cf: am a29b8fbb: am 908c50a1: am f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs

* commit '43838d3f0b4473b891123be42fcdecb995543720':
  Adding a link to what is currently our most popular "100 Days" video.

9 years agoam 605b1e97: am 1d391c85: am 7acee935: am e249eb3a: Merge "Perform One touch play...
Jinsuk Kim [Tue, 14 Jul 2015 17:16:02 +0000 (17:16 +0000)]
am 605b1e97: am 1d391c85: am 7acee935: am e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev

* commit '605b1e9796def7bbc5af7e6393b5cc70395b1366':
  Perform One touch play upon pressing home key

9 years agoam 5eb7fd29: am ff5c6fde: am 2ce65bdd: am cf01fd0f: Merge "Catch & log security excep...
Roshan Pius [Tue, 14 Jul 2015 16:30:04 +0000 (16:30 +0000)]
am 5eb7fd29: am ff5c6fde: am 2ce65bdd: am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev

* commit '5eb7fd29da2254bdc45f2d09d5bc59292ee0cc99':
  Catch & log security exception in telephonymanager

9 years agoam 274d3052: am 67091577: am 66eb1ad1: am 53e5ba22: Merge "Do not check runtime READ_...
Amit Mahajan [Tue, 14 Jul 2015 16:29:58 +0000 (16:29 +0000)]
am 274d3052: am 67091577: am 66eb1ad1: am 53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev

* commit '274d30521f78be5c9e7706cda469f78bf9f98afc':
  Do not check runtime READ_PHONE_STATE if caller has the privileged one.

9 years agoam 5d84b44b: am 72e8e080: am 074b3ceb: am f96d9c54: Merge "Improve resource loading...
John Reck [Tue, 14 Jul 2015 16:29:52 +0000 (16:29 +0000)]
am 5d84b44b: am 72e8e080: am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev

* commit '5d84b44b416b5efd2d138c36e691d43396c1c1d8':
  Improve resource loading by ~3x

9 years agoam 061846d1: am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused...
Wale Ogunwale [Tue, 14 Jul 2015 16:29:40 +0000 (16:29 +0000)]
am 061846d1: am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit '061846d19fb29a09b9972a47c94110464e8177d1':
  Finish already paused activity if it should be finished after pausing

9 years agoam 266576c1: am 7ad8e6c8: am 3f96f8b2: am 0bd08fc2: Merge "Fix multiple SSIDs for...
Vinit Deshpande [Tue, 14 Jul 2015 16:29:33 +0000 (16:29 +0000)]
am 266576c1: am 7ad8e6c8: am 3f96f8b2: am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev

* commit '266576c1a63f7be4d0ca9351dbb8c80d539be5f0':
  Fix multiple SSIDs for same Passpoint issues

9 years agoam 5ab70110: am a9845680: am a95d9f0b: am 16c1764c: Merge "Change MANAGE_FINGERPRINT...
Jim Miller [Tue, 14 Jul 2015 16:29:26 +0000 (16:29 +0000)]
am 5ab70110: am a9845680: am a95d9f0b: am 16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev

* commit '5ab7011041a1944f9595c9361858639507cf63a3':
  Change MANAGE_FINGERPRINT permission to system|signature

9 years agoam bbe42345: am f61d30cc: am 42cae4ab: am 37511e35: Merge "Log full class name of...
Aravind Akella [Tue, 14 Jul 2015 16:29:19 +0000 (16:29 +0000)]
am bbe42345: am f61d30cc: am 42cae4ab: am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev

* commit 'bbe4234545e1a6e4fcb792aac5a159e095edfd76':
  Log full class name of the client activating sensors for better debugging.

9 years agoam afe38c01: am a249976c: am 686be938: am c09544bb: Merge "Fix filter on CONNECTIVITY...
Etan Cohen [Tue, 14 Jul 2015 16:29:12 +0000 (16:29 +0000)]
am afe38c01: am a249976c: am 686be938: am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev

* commit 'afe38c01a80dc4e3f2d54a46184bffd7d8a8c5a4':
  Fix filter on CONNECTIVITY_ACTION updates

9 years agoam 4521361a: am 14627a2c: am 7efb0521: am 1578357d: Merge "Check user state after...
Amith Yamasani [Tue, 14 Jul 2015 16:29:02 +0000 (16:29 +0000)]
am 4521361a: am 14627a2c: am 7efb0521: am 1578357d: Merge "Check user state after clearing identity." into mnc-dev

* commit '4521361a5d58652249ec832565abac1f5b16de00':
  Check user state after clearing identity.

9 years agoam 01a73cd8: am 500db3c1: am d5b0f69a: am 208934ff: Merge "fix build by restoring...
Chris Wren [Tue, 14 Jul 2015 16:28:54 +0000 (16:28 +0000)]
am 01a73cd8: am 500db3c1: am d5b0f69a: am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev

* commit '01a73cd81ea35f18eba96916e1c80eb5b800e922':
  fix build by restoring deleted enum

9 years agoam 711ff332: am 91941a57: am 19fd8658: am fbd0a444: Merge "Remove personal/device...
Julia Reynolds [Tue, 14 Jul 2015 16:28:43 +0000 (16:28 +0000)]
am 711ff332: am 91941a57: am 19fd8658: am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev

* commit '711ff3323fd6641bbf83bbdad5c4032db98d8572':
  Remove personal/device group from sideloading screen.

9 years agoam 2cdbe7d1: am 5c84cc8e: am cdeeeb69: am 28a07ff0: Merge "Fix demo mode issues"...
Jason Monk [Tue, 14 Jul 2015 16:28:34 +0000 (16:28 +0000)]
am 2cdbe7d1: am 5c84cc8e: am cdeeeb69: am 28a07ff0: Merge "Fix demo mode issues" into mnc-dev

* commit '2cdbe7d1b73a40abafb7596396cc97c40dd3803c':
  Fix demo mode issues

9 years agoam 4810bf5d: am ea794192: am 2d8e0173: am 4502bfb8: Merge "add new enums to MetricsCo...
Chris Wren [Tue, 14 Jul 2015 16:28:28 +0000 (16:28 +0000)]
am 4810bf5d: am ea794192: am 2d8e0173: am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev

* commit '4810bf5de92caa55494e484ef36043f2c8fc52b7':
  add new enums to MetricsConstans

9 years agoam 10f015f0: am fceeadc3: am a04f5f27: am 59b1dfef: Merge "Show volume restriction...
Jason Monk [Tue, 14 Jul 2015 16:28:22 +0000 (16:28 +0000)]
am 10f015f0: am fceeadc3: am a04f5f27: am 59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev

* commit '10f015f04847d4e0623da3945fe12752729b7903':
  Show volume restriction toast on all users

9 years agoam bd16cb67: (-s ours) am b48de758: (-s ours) am d64aa493: (-s ours) am c021aaaf...
Geoff Mendal [Tue, 14 Jul 2015 16:28:17 +0000 (16:28 +0000)]
am bd16cb67: (-s ours) am b48de758: (-s ours) am d64aa493: (-s ours) am c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam afe3c2b3: am 474f987d: am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageForm...
Rubin Xu [Tue, 14 Jul 2015 16:28:06 +0000 (16:28 +0000)]
am afe3c2b3: am 474f987d: am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev

* commit 'afe3c2b3e51b254826b44559d6f4aebe40855168':
  Remove ExternalStorageFormatter

9 years agoam d943ac7d: am 8dd280c2: am f463ac66: am 0ec43f89: Merge "Use correct user when...
Esteban Talavera [Tue, 14 Jul 2015 16:28:00 +0000 (16:28 +0000)]
am d943ac7d: am 8dd280c2: am f463ac66: am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev

* commit 'd943ac7d0754ef7b18c0ec459448d31ec853305e':
  Use correct user when filtering app link candidates

9 years agoam 3b869cb4: am 220fd3c0: am 4b114575: am 22921603: Merge "Don\'t send app links...
Esteban Talavera [Tue, 14 Jul 2015 16:27:54 +0000 (16:27 +0000)]
am 3b869cb4: am 220fd3c0: am 4b114575: am 22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev

* commit '3b869cb49d5c22fa92d37057587b6d0569696ff4':
  Don't send app links to parent profile if status == never

9 years agoam cb2a7a2c: am 0be2efb2: am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope...
Billy Lau [Tue, 14 Jul 2015 16:27:45 +0000 (16:27 +0000)]
am cb2a7a2c: am 0be2efb2: am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev

* commit 'cb2a7a2cc48253e8fe941322f4b59b8e2125eae8':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission

9 years agoam b5468cbf: am cf00a864: am a9fc8aa3: am 4fb81253: Camera metadata: fix typos.
Zhijun He [Tue, 14 Jul 2015 16:27:39 +0000 (16:27 +0000)]
am b5468cbf: am cf00a864: am a9fc8aa3: am 4fb81253: Camera metadata: fix typos.

* commit 'b5468cbf3060d2b7d6909e1cbaac18beb61e7111':
  Camera metadata: fix typos.

9 years agoam eecc70e4: (-s ours) am e8284f31: (-s ours) am a2360b83: (-s ours) am 1962ad3e...
Geoff Mendal [Tue, 14 Jul 2015 16:27:33 +0000 (16:27 +0000)]
am eecc70e4: (-s ours) am e8284f31: (-s ours) am a2360b83: (-s ours) am 1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 5713c9ba: (-s ours) am 9710294d: (-s ours) am 01b006e1: (-s ours) am d64ba82e...
Geoff Mendal [Tue, 14 Jul 2015 16:27:26 +0000 (16:27 +0000)]
am 5713c9ba: (-s ours) am 9710294d: (-s ours) am 01b006e1: (-s ours) am d64ba82e: (-s ours) Import translations. DO NOT MERGE

* commit '5713c9ba97aed895e100f0474752fb3ece6f88cf':
  Import translations. DO NOT MERGE

9 years agoam 9d66b9cd: am 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml()...
Raph Levien [Tue, 14 Jul 2015 16:27:20 +0000 (16:27 +0000)]
am 9d66b9cd: am 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev

* commit '9d66b9cdc022399c2ed9c9c0bb86b172df1b3b75':
  Improve Html.toHtml() documentation

9 years agoam f62ca82b: am a5aaf335: am 0fd2d2b1: am 292eb65f: Merge "Fix new user creation...
Amith Yamasani [Tue, 14 Jul 2015 16:27:13 +0000 (16:27 +0000)]
am f62ca82b: am a5aaf335: am 0fd2d2b1: am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev

* commit 'f62ca82b96f75c714a5cd82f9d35df2bad686455':
  Fix new user creation regression due to vold remount calls

9 years agoam ff61f431: am 2ae3ff2d: am 8117c2f8: am 5449ee07: Merge "Avoid IPC call with an...
Amith Yamasani [Tue, 14 Jul 2015 16:26:59 +0000 (16:26 +0000)]
am ff61f431: am 2ae3ff2d: am 8117c2f8: am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev

* commit 'ff61f4312a3bba3a217f7da96a300a5ed72d4937':
  Avoid IPC call with an empty array

9 years agoam cb9d3de0: am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passp...
Sanket Padawe [Tue, 14 Jul 2015 16:26:50 +0000 (16:26 +0000)]
am cb9d3de0: am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev

* commit 'cb9d3de03293210c76928934e04da5c4b73c833a':
  Changes security for Passpoint to EAP security from "Passpoint".

9 years agoam 60e293cf: am 63d58c0a: am dc445a11: am d374c20f: Merge "Fix flash of uninitialized...
Adrian Roos [Tue, 14 Jul 2015 16:26:43 +0000 (16:26 +0000)]
am 60e293cf: am 63d58c0a: am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev

* commit '60e293cfed07ef32c16262435dc3d9092a7fb572':
  Fix flash of uninitialized surface

9 years agoam 1aefc776: am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security...
Carlos Valdivia [Tue, 14 Jul 2015 16:26:35 +0000 (16:26 +0000)]
am 1aefc776: am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev

* commit '1aefc7769804ad1b593355f7bd71e4d6f962d132':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""

9 years agoam 8fe9a017: am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn...
Mady Mellor [Tue, 14 Jul 2015 16:26:18 +0000 (16:26 +0000)]
am 8fe9a017: am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev

* commit '8fe9a0173ea9dd7334c5a634dea76055097e04ab':
  Fix: line slop shouldn't always increase / decrease by one line

9 years agoam 8f85f645: am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at...
Mady Mellor [Tue, 14 Jul 2015 16:26:11 +0000 (16:26 +0000)]
am 8f85f645: am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev

* commit '8f85f645154d02a3808ed3f3a3353d836fd994a5':
  Fix line slop issue at end of line for Thai & CJK

9 years agoam bdd89eed: am d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already...
Wale Ogunwale [Tue, 14 Jul 2015 16:26:00 +0000 (16:26 +0000)]
am bdd89eed: am d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev

* commit 'bdd89eed375efdb23be8598e28661f2b7d0964d4':
  Revert "Finish already paused activity if it should be finished after pausing"

9 years agoam dc7368cb: am 78c93dfc: am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks...
John Reck [Tue, 14 Jul 2015 16:25:52 +0000 (16:25 +0000)]
am dc7368cb: am 78c93dfc: am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev

* commit 'dc7368cb856025b4c9813bc6ff96d5b7c311b690':
  JNI optimization tweaks to Paint high-frequency methods

9 years agoam e8a5ae29: am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type...
Chris Craik [Tue, 14 Jul 2015 16:25:40 +0000 (16:25 +0000)]
am e8a5ae29: am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev

* commit 'e8a5ae29a0898de1a3194c079821091859afac31':
  Reduce cost of span type checking

9 years agoam 17cfb5ec: am af5b992c: am 9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor...
Jason Monk [Tue, 14 Jul 2015 00:51:38 +0000 (00:51 +0000)]
am 17cfb5ec: am af5b992c: am 9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev

* commit '17cfb5ec67e739b3d61342472f2c6568118c3884':
  Add a dumpsys for KeyguardUpdateMonitor

9 years agoam 37621e24: am 92573764: am fd186d20: am 28006a3b: am 7182f075: Merge "docs: Changed...
Robert Schaub [Tue, 14 Jul 2015 00:51:32 +0000 (00:51 +0000)]
am 37621e24: am 92573764: am fd186d20: am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs

* commit '37621e246e59baeb564a2ee45d86a799a6f0f6b3':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup

9 years agoam d0ca9dea: am 695fc97a: am 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed...
Robert Schaub [Tue, 14 Jul 2015 00:51:26 +0000 (00:51 +0000)]
am d0ca9dea: am 695fc97a: am 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs

* commit 'd0ca9dea259b2dd2def75f4f32722eddf409bea4':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing

9 years agoam cb533c53: am 63bd0587: am 91a44578: am 5c3bf584: am e0f0fabb: am ccb8a9af: am...
David Friedman [Tue, 14 Jul 2015 00:51:19 +0000 (00:51 +0000)]
am cb533c53: am 63bd0587: am 91a44578: am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs

* commit 'cb533c53b380886975ffb8068d2df581d9747022':
  docs: replacing command line tool instructions with Studio and Monitor steps

9 years agoam 16df17cf: am a29b8fbb: am 908c50a1: am f13e914d: am 8cce3984: Merge "Adding a...
Eric Gilmore [Tue, 14 Jul 2015 00:51:13 +0000 (00:51 +0000)]
am 16df17cf: am a29b8fbb: am 908c50a1: am f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs

* commit '16df17cf19072664301def14c3f9f48ab6a1945a':
  Adding a link to what is currently our most popular "100 Days" video.

9 years agoam 1d391c85: am 7acee935: am e249eb3a: Merge "Perform One touch play upon pressing...
Jinsuk Kim [Tue, 14 Jul 2015 00:51:07 +0000 (00:51 +0000)]
am 1d391c85: am 7acee935: am e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev

* commit '1d391c85bbe8314c036c362e37587bf6963d2359':
  Perform One touch play upon pressing home key

9 years agoam ff5c6fde: am 2ce65bdd: am cf01fd0f: Merge "Catch & log security exception in telep...
Roshan Pius [Tue, 14 Jul 2015 00:39:40 +0000 (00:39 +0000)]
am ff5c6fde: am 2ce65bdd: am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev

* commit 'ff5c6fdef417c8f834b30837a111c9f17bc4a0af':
  Catch & log security exception in telephonymanager

9 years agoam 67091577: am 66eb1ad1: am 53e5ba22: Merge "Do not check runtime READ_PHONE_STATE...
Amit Mahajan [Tue, 14 Jul 2015 00:39:34 +0000 (00:39 +0000)]
am 67091577: am 66eb1ad1: am 53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev

* commit '6709157781344ed4b38d607abf245acb4b2d8f38':
  Do not check runtime READ_PHONE_STATE if caller has the privileged one.

9 years agoam 72e8e080: am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into...
John Reck [Tue, 14 Jul 2015 00:39:29 +0000 (00:39 +0000)]
am 72e8e080: am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev

* commit '72e8e0807a8734cb65199ec0a92e9dc4db7a2588':
  Improve resource loading by ~3x

9 years agoam ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused activity if it...
Wale Ogunwale [Tue, 14 Jul 2015 00:39:22 +0000 (00:39 +0000)]
am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit 'ec565efe706746157883822a93470cb3ef0fe6c0':
  Finish already paused activity if it should be finished after pausing

9 years agoam 7ad8e6c8: am 3f96f8b2: am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint...
Vinit Deshpande [Tue, 14 Jul 2015 00:39:16 +0000 (00:39 +0000)]
am 7ad8e6c8: am 3f96f8b2: am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev

* commit '7ad8e6c8499f5b5327f6b81fb34e15f5d855a641':
  Fix multiple SSIDs for same Passpoint issues

9 years agoam a9845680: am a95d9f0b: am 16c1764c: Merge "Change MANAGE_FINGERPRINT permission...
Jim Miller [Tue, 14 Jul 2015 00:39:10 +0000 (00:39 +0000)]
am a9845680: am a95d9f0b: am 16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev

* commit 'a9845680221b1b343f13db0482264f07f07b57f1':
  Change MANAGE_FINGERPRINT permission to system|signature

9 years agoam f61d30cc: am 42cae4ab: am 37511e35: Merge "Log full class name of the client activ...
Aravind Akella [Tue, 14 Jul 2015 00:39:05 +0000 (00:39 +0000)]
am f61d30cc: am 42cae4ab: am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev

* commit 'f61d30ccdc97e7c34405fde2d2e2c9988ce076c4':
  Log full class name of the client activating sensors for better debugging.

9 years agoam a249976c: am 686be938: am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updat...
Etan Cohen [Tue, 14 Jul 2015 00:38:59 +0000 (00:38 +0000)]
am a249976c: am 686be938: am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev

* commit 'a249976c3ed32a7d1051e9a5ce28f58826ba9100':
  Fix filter on CONNECTIVITY_ACTION updates

9 years agoam 14627a2c: am 7efb0521: am 1578357d: Merge "Check user state after clearing identit...
Amith Yamasani [Tue, 14 Jul 2015 00:38:53 +0000 (00:38 +0000)]
am 14627a2c: am 7efb0521: am 1578357d: Merge "Check user state after clearing identity." into mnc-dev

* commit '14627a2c4a74d4b9c72df145e5c194572ae07632':
  Check user state after clearing identity.

9 years agoam 500db3c1: am d5b0f69a: am 208934ff: Merge "fix build by restoring deleted enum...
Chris Wren [Tue, 14 Jul 2015 00:38:47 +0000 (00:38 +0000)]
am 500db3c1: am d5b0f69a: am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev

* commit '500db3c10dda42c32da3c54733de7b1ab22bc583':
  fix build by restoring deleted enum

9 years agoam 91941a57: am 19fd8658: am fbd0a444: Merge "Remove personal/device group from sidel...
Julia Reynolds [Tue, 14 Jul 2015 00:38:41 +0000 (00:38 +0000)]
am 91941a57: am 19fd8658: am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev

* commit '91941a57bec83889a98cc9a623a8c8d388fd4b6c':
  Remove personal/device group from sideloading screen.

9 years agoam 5c84cc8e: am cdeeeb69: am 28a07ff0: Merge "Fix demo mode issues" into mnc-dev
Jason Monk [Tue, 14 Jul 2015 00:38:32 +0000 (00:38 +0000)]
am 5c84cc8e: am cdeeeb69: am 28a07ff0: Merge "Fix demo mode issues" into mnc-dev

* commit '5c84cc8e6a60b006ea323f2a913e2bd1d494f698':
  Fix demo mode issues

9 years agoam ea794192: am 2d8e0173: am 4502bfb8: Merge "add new enums to MetricsConstans" into...
Chris Wren [Tue, 14 Jul 2015 00:38:26 +0000 (00:38 +0000)]
am ea794192: am 2d8e0173: am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev

* commit 'ea794192cf796b82407bdb9b3766db747ff45cc3':
  add new enums to MetricsConstans

9 years agoam fceeadc3: am a04f5f27: am 59b1dfef: Merge "Show volume restriction toast on all...
Jason Monk [Tue, 14 Jul 2015 00:38:19 +0000 (00:38 +0000)]
am fceeadc3: am a04f5f27: am 59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev

* commit 'fceeadc3f9b9cd574b79797122a15351cc006a15':
  Show volume restriction toast on all users

9 years agoam b48de758: (-s ours) am d64aa493: (-s ours) am c021aaaf: (-s ours) Merge "Import...
Geoff Mendal [Tue, 14 Jul 2015 00:38:13 +0000 (00:38 +0000)]
am b48de758: (-s ours) am d64aa493: (-s ours) am c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 474f987d: am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageFormatter" into...
Rubin Xu [Tue, 14 Jul 2015 00:38:12 +0000 (00:38 +0000)]
am 474f987d: am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev

* commit '474f987dd783493967e9ea899398f6965a7d3515':
  Remove ExternalStorageFormatter

9 years agoam af5b992c: am 9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev
Jason Monk [Tue, 14 Jul 2015 00:27:54 +0000 (00:27 +0000)]
am af5b992c: am 9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev

* commit 'af5b992c85e589e11a3063a47a97829eef4e218d':
  Add a dumpsys for KeyguardUpdateMonitor

9 years agoam 92573764: am fd186d20: am 28006a3b: am 7182f075: Merge "docs: Changed text as...
Robert Schaub [Tue, 14 Jul 2015 00:27:50 +0000 (00:27 +0000)]
am 92573764: am fd186d20: am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs

* commit '92573764195b99971b5649ff1ad7d869191828df':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup

9 years agoam 695fc97a: am 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic...
Robert Schaub [Tue, 14 Jul 2015 00:27:45 +0000 (00:27 +0000)]
am 695fc97a: am 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs

* commit '695fc97aa2e24306537772195c33db0fffa4a23e':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing

9 years agoam 63bd0587: am 91a44578: am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge...
David Friedman [Tue, 14 Jul 2015 00:27:34 +0000 (00:27 +0000)]
am 63bd0587: am 91a44578: am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs

* commit '63bd0587f908e7799764fa159a20c111d725c4f6':
  docs: replacing command line tool instructions with Studio and Monitor steps

9 years agoam a29b8fbb: am 908c50a1: am f13e914d: am 8cce3984: Merge "Adding a link to what...
Eric Gilmore [Tue, 14 Jul 2015 00:27:30 +0000 (00:27 +0000)]
am a29b8fbb: am 908c50a1: am f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs

* commit 'a29b8fbb329099fcb78228ab21b8560c383ea0da':
  Adding a link to what is currently our most popular "100 Days" video.

9 years agoam 7acee935: am e249eb3a: Merge "Perform One touch play upon pressing home key" into...
Jinsuk Kim [Tue, 14 Jul 2015 00:27:26 +0000 (00:27 +0000)]
am 7acee935: am e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev

* commit '7acee9353b634ce3a60bf8b1fac0e24ac7f770f9':
  Perform One touch play upon pressing home key

9 years agoam 8dd280c2: am f463ac66: am 0ec43f89: Merge "Use correct user when filtering app...
Esteban Talavera [Tue, 14 Jul 2015 00:21:55 +0000 (00:21 +0000)]
am 8dd280c2: am f463ac66: am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev

* commit '8dd280c2b95af184c8547065ba4146aceb2900ac':
  Use correct user when filtering app link candidates

9 years agoam 220fd3c0: am 4b114575: am 22921603: Merge "Don\'t send app links to parent profile...
Esteban Talavera [Tue, 14 Jul 2015 00:21:49 +0000 (00:21 +0000)]
am 220fd3c0: am 4b114575: am 22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev

* commit '220fd3c047307e70211ae13456d9187f0b97ce26':
  Don't send app links to parent profile if status == never

9 years agoam 0be2efb2: am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS...
Billy Lau [Tue, 14 Jul 2015 00:21:42 +0000 (00:21 +0000)]
am 0be2efb2: am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev

* commit '0be2efb256c6bcac3f9d17319c9af90bbef1010c':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission

9 years agoam cf00a864: am a9fc8aa3: am 4fb81253: Camera metadata: fix typos.
Zhijun He [Tue, 14 Jul 2015 00:21:36 +0000 (00:21 +0000)]
am cf00a864: am a9fc8aa3: am 4fb81253: Camera metadata: fix typos.

* commit 'cf00a86461bb39ca5cb6461cab280aeb4d42bab3':
  Camera metadata: fix typos.

9 years agoam e8284f31: (-s ours) am a2360b83: (-s ours) am 1962ad3e: (-s ours) Merge "Import...
Geoff Mendal [Tue, 14 Jul 2015 00:21:28 +0000 (00:21 +0000)]
am e8284f31: (-s ours) am a2360b83: (-s ours) am 1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 9710294d: (-s ours) am 01b006e1: (-s ours) am d64ba82e: (-s ours) Import translati...
Geoff Mendal [Tue, 14 Jul 2015 00:21:22 +0000 (00:21 +0000)]
am 9710294d: (-s ours) am 01b006e1: (-s ours) am d64ba82e: (-s ours) Import translations. DO NOT MERGE

* commit '9710294d14b6e6071d650a33929d230286be8ff0':
  Import translations. DO NOT MERGE

9 years agoam 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation...
Raph Levien [Tue, 14 Jul 2015 00:21:16 +0000 (00:21 +0000)]
am 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev

* commit '073477a18ee37c87ad69260edae48f48578af921':
  Improve Html.toHtml() documentation

9 years agoam a5aaf335: am 0fd2d2b1: am 292eb65f: Merge "Fix new user creation regression due...
Amith Yamasani [Tue, 14 Jul 2015 00:21:08 +0000 (00:21 +0000)]
am a5aaf335: am 0fd2d2b1: am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev

* commit 'a5aaf335fa57e34622c6638efe8849c46ae76087':
  Fix new user creation regression due to vold remount calls

9 years agoam 2ae3ff2d: am 8117c2f8: am 5449ee07: Merge "Avoid IPC call with an empty array...
Amith Yamasani [Tue, 14 Jul 2015 00:21:02 +0000 (00:21 +0000)]
am 2ae3ff2d: am 8117c2f8: am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev

* commit '2ae3ff2deac3d700f9fe39f16ab2afef69ac13c8':
  Avoid IPC call with an empty array

9 years agoam f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP...
Sanket Padawe [Tue, 14 Jul 2015 00:20:55 +0000 (00:20 +0000)]
am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev

* commit 'f1a9868e18d1feb56434313701faaf52473f0942':
  Changes security for Passpoint to EAP security from "Passpoint".

9 years agoam 63d58c0a: am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface...
Adrian Roos [Tue, 14 Jul 2015 00:20:49 +0000 (00:20 +0000)]
am 63d58c0a: am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev

* commit '63d58c0a33655faa1c6dd847d589872ab4d4f375':
  Fix flash of uninitialized surface

9 years agoam 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChoose...
Carlos Valdivia [Tue, 14 Jul 2015 00:20:42 +0000 (00:20 +0000)]
am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev

* commit '4e976dd141dd585f7aea580048a85829e8658753':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""

9 years agoam 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increa...
Mady Mellor [Tue, 14 Jul 2015 00:20:36 +0000 (00:20 +0000)]
am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev

* commit '441ad4df23e064cefbed6e3b63ee56161ce19032':
  Fix: line slop shouldn't always increase / decrease by one line

9 years agoam 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line...
Mady Mellor [Tue, 14 Jul 2015 00:20:29 +0000 (00:20 +0000)]
am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev

* commit '9d4cd8cf48a06dbf2c6dff6ef2caf5ed79f89bff':
  Fix line slop issue at end of line for Thai & CJK

9 years agoam d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity...
Wale Ogunwale [Tue, 14 Jul 2015 00:20:21 +0000 (00:20 +0000)]
am d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev

* commit 'd91f9c7e996241060a7503461e44e4e6787611dd':
  Revert "Finish already paused activity if it should be finished after pausing"

9 years agoam 78c93dfc: am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high...
John Reck [Tue, 14 Jul 2015 00:20:15 +0000 (00:20 +0000)]
am 78c93dfc: am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev

* commit '78c93dfce682cac02f1e61b7c943c19fe5160001':
  JNI optimization tweaks to Paint high-frequency methods

9 years agoam 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking"...
Chris Craik [Tue, 14 Jul 2015 00:20:07 +0000 (00:20 +0000)]
am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev

* commit '3b34b0061b1c57e5932fc17f8611574233e768ae':
  Reduce cost of span type checking

9 years agoam 9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev
Jason Monk [Tue, 14 Jul 2015 00:15:40 +0000 (00:15 +0000)]
am 9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev

* commit '9c2182e1b3d7a2eedb072d4ddcacb903e67b25aa':
  Add a dumpsys for KeyguardUpdateMonitor

9 years agoam fd186d20: am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in...
Robert Schaub [Tue, 14 Jul 2015 00:15:35 +0000 (00:15 +0000)]
am fd186d20: am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs

* commit 'fd186d20c53e8b0565f1360a71618710631eceeb':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup

9 years agoam 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that...
Robert Schaub [Tue, 14 Jul 2015 00:15:31 +0000 (00:15 +0000)]
am 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs

* commit '0b403ebd6aecdf6691c4df009c791096d734aeb0':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing

9 years agoam 91a44578: am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replaci...
David Friedman [Tue, 14 Jul 2015 00:15:27 +0000 (00:15 +0000)]
am 91a44578: am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs

* commit '91a44578e4f1788cb97da79863faaa4ba7970f45':
  docs: replacing command line tool instructions with Studio and Monitor steps

9 years agoam 908c50a1: am f13e914d: am 8cce3984: Merge "Adding a link to what is currently...
Eric Gilmore [Tue, 14 Jul 2015 00:15:23 +0000 (00:15 +0000)]
am 908c50a1: am f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs

* commit '908c50a1727f546aa060b9fff1f2c648739acfee':
  Adding a link to what is currently our most popular "100 Days" video.

9 years agoam e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev
Jinsuk Kim [Tue, 14 Jul 2015 00:15:19 +0000 (00:15 +0000)]
am e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev

* commit 'e249eb3a6f33ee945113a8f11e8382e70c4e066f':
  Perform One touch play upon pressing home key

9 years agoMerge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev
Jason Monk [Tue, 14 Jul 2015 00:10:09 +0000 (00:10 +0000)]
Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev

9 years agoam 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advert...
Robert Schaub [Mon, 13 Jul 2015 23:58:09 +0000 (23:58 +0000)]
am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs

* commit '28006a3b31d1cd3765568ceed211f8bc8de9c50c':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup

9 years agoam 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanati...
Robert Schaub [Mon, 13 Jul 2015 23:58:03 +0000 (23:58 +0000)]
am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs

* commit '1962b730067d5b9ad9666ee3a7d1e3f90004c7d7':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing

9 years agoam 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command...
David Friedman [Mon, 13 Jul 2015 23:57:52 +0000 (23:57 +0000)]
am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs

* commit '5c3bf5847c98b23a525288ed04f77b2a68ec6870':
  docs: replacing command line tool instructions with Studio and Monitor steps

9 years agoam f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular...
Eric Gilmore [Mon, 13 Jul 2015 23:57:43 +0000 (23:57 +0000)]
am f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs

* commit 'f13e914d23a47809d978183a8e6b6ab3a5d51098':
  Adding a link to what is currently our most popular "100 Days" video.

9 years agoam 2ce65bdd: am cf01fd0f: Merge "Catch & log security exception in telephonymanager...
Roshan Pius [Mon, 13 Jul 2015 23:56:12 +0000 (23:56 +0000)]
am 2ce65bdd: am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev

* commit '2ce65bddb50ecd376cc4eafdc9853b6bf50ac970':
  Catch & log security exception in telephonymanager

9 years agoam 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a...
Paul Crowley [Mon, 13 Jul 2015 23:51:03 +0000 (23:51 +0000)]
am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev

* commit '63690fa5b056523e2dce52fe9dc2954e92b55bca':
  Delete the user key when deleting a user.

9 years agoam 7b6493a7: am 62d43bd9: am 9e0e6991: Merge "Use mount service to create user dirs...
Paul Crowley [Mon, 13 Jul 2015 23:50:58 +0000 (23:50 +0000)]
am 7b6493a7: am 62d43bd9: am 9e0e6991: Merge "Use mount service to create user dirs." into mnc-dr-dev

* commit '7b6493a7b7da70610735b87c30f0c2c9d0cf0ea1':
  Use mount service to create user dirs.

9 years agoam 2d64ad5c: am 7321f09f: am 6a5c9370: am 6795a2ae: Check legacy VPN is connected...
Robin Lee [Mon, 13 Jul 2015 23:50:52 +0000 (23:50 +0000)]
am 2d64ad5c: am 7321f09f: am 6a5c9370: am 6795a2ae: Check legacy VPN is connected before alerting

* commit '2d64ad5c9d52ab89334ebcdeb07d2d556db8a989':
  Check legacy VPN is connected before alerting

9 years agoam 9042b4ce: am 3539d328: am 7f3a1557: am 0c758805: Merge "Fix empty keyguard for...
Jorim Jaggi [Mon, 13 Jul 2015 23:50:44 +0000 (23:50 +0000)]
am 9042b4ce: am 3539d328: am 7f3a1557: am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev

* commit '9042b4ced76b5ecdb6d4c334eb7004c34c7892a7':
  Fix empty keyguard for once and all