John Reck
84e7055983
am ae94ac95: am 5d84b44b: am 72e8e080: am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev
...
* commit 'ae94ac95754f4e1c4d4f9fda83e7a7e15e90d90b':
Improve resource loading by ~3x
2015-07-14 16:52:13 +00:00
Aravind Akella
40d8c2be35
am 6804eed8: 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 '6804eed853fe7afb597a7ec84c30e0df4ca74848':
Log full class name of the client activating sensors for better debugging.
2015-07-14 16:51:44 +00:00
Chris Wren
8665a4e932
am 92c5e775: am 01a73cd8: am 500db3c1: am d5b0f69a: am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
...
* commit '92c5e7752005776ada31a7d4992548e36f06f335':
fix build by restoring deleted enum
2015-07-14 16:51:23 +00:00
Julia Reynolds
a7380629e9
am e8ff4f71: am 711ff332: am 91941a57: am 19fd8658: am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev
...
* commit 'e8ff4f718dff0cf00c6c852f2bc908b508850fa1':
Remove personal/device group from sideloading screen.
2015-07-14 16:51:16 +00:00
Chris Wren
d2d6e41173
am 23652ff5: am 4810bf5d: am ea794192: am 2d8e0173: am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
...
* commit '23652ff538f414ca32b0c792bc29c60a4c62e4ca':
add new enums to MetricsConstans
2015-07-14 16:51:01 +00:00
Rubin Xu
949d16ebd5
am 5571a986: am afe3c2b3: am 474f987d: am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev
...
* commit '5571a986f0a2939248aefc584248d08732c761e4':
Remove ExternalStorageFormatter
2015-07-14 16:50:41 +00:00
Billy Lau
4c8d312606
am e385d26f: am cb2a7a2c: am 0be2efb2: am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
...
* commit 'e385d26fef2f62988c082ee8066f5d6715aa16c9':
Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
2015-07-14 16:50:20 +00:00
Zhijun He
71e1b0af54
am 48016b9a: am b5468cbf: am cf00a864: am a9fc8aa3: am 4fb81253: Camera metadata: fix typos.
...
* commit '48016b9afeae0cd246a1385471635180c64bc41c':
Camera metadata: fix typos.
2015-07-14 16:50:13 +00:00
Raph Levien
b34396d3c5
am aac0c9e7: am 9d66b9cd: am 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev
...
* commit 'aac0c9e7583239ec55e0456c4c88b79f5615caca':
Improve Html.toHtml() documentation
2015-07-14 16:49:51 +00:00
Carlos Valdivia
4eafb7a0d2
am 50cf5e3a: am 1aefc776: am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev
...
* commit '50cf5e3a2bd544f4661660756ffc4c67d5afbb21':
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
2015-07-14 16:49:09 +00:00
Mady Mellor
2f30e890cd
am 604b1138: am 8fe9a017: am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev
...
* commit '604b1138f166a75b80c79243432798416a843c93':
Fix: line slop shouldn't always increase / decrease by one line
2015-07-14 16:49:01 +00:00
Mady Mellor
60ca990850
am ee4d90ba: am 8f85f645: am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev
...
* commit 'ee4d90ba0d5abbb7379e6f47d97c12619bbfeeee':
Fix line slop issue at end of line for Thai & CJK
2015-07-14 16:48:54 +00:00
Chris Craik
f689dfc549
am f451be08: am e8a5ae29: am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev
...
* commit 'f451be081f5460a10b6ccf2d5e129ee69241da0f':
Reduce cost of span type checking
2015-07-14 16:48:28 +00:00
John Reck
ae94ac9575
am 5d84b44b: am 72e8e080: am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev
...
* commit '5d84b44b416b5efd2d138c36e691d43396c1c1d8':
Improve resource loading by ~3x
2015-07-14 16:29:52 +00:00
Aravind Akella
6804eed853
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.
2015-07-14 16:29:19 +00:00
Chris Wren
92c5e77520
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
2015-07-14 16:28:54 +00:00
Julia Reynolds
e8ff4f718d
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.
2015-07-14 16:28:43 +00:00
Chris Wren
23652ff538
am 4810bf5d: am ea794192: am 2d8e0173: am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
...
* commit '4810bf5de92caa55494e484ef36043f2c8fc52b7':
add new enums to MetricsConstans
2015-07-14 16:28:28 +00:00
Rubin Xu
5571a986f0
am afe3c2b3: am 474f987d: am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev
...
* commit 'afe3c2b3e51b254826b44559d6f4aebe40855168':
Remove ExternalStorageFormatter
2015-07-14 16:28:06 +00:00
Billy Lau
e385d26fef
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
2015-07-14 16:27:45 +00:00
Zhijun He
48016b9afe
am b5468cbf: am cf00a864: am a9fc8aa3: am 4fb81253: Camera metadata: fix typos.
...
* commit 'b5468cbf3060d2b7d6909e1cbaac18beb61e7111':
Camera metadata: fix typos.
2015-07-14 16:27:39 +00:00
Raph Levien
aac0c9e758
am 9d66b9cd: am 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev
...
* commit '9d66b9cdc022399c2ed9c9c0bb86b172df1b3b75':
Improve Html.toHtml() documentation
2015-07-14 16:27:20 +00:00
Carlos Valdivia
50cf5e3a2b
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.""
2015-07-14 16:26:35 +00:00
Mady Mellor
604b1138f1
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
2015-07-14 16:26:18 +00:00
Mady Mellor
ee4d90ba0d
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
2015-07-14 16:26:11 +00:00
Chris Craik
f451be081f
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
2015-07-14 16:25:40 +00:00
Paul Crowley
d2c9d0d92c
Revert "am 8ae629f6: am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev"
...
This reverts commit c5da3fe1ded884b41331
2015-07-14 15:42:29 +01:00
Paul Crowley
c5da3fe1de
am 8ae629f6: am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev
...
* commit '8ae629f6cbda2ad55a1b6f3f508a04dc348ed796':
Delete the user key when deleting a user.
2015-07-14 12:00:55 +00:00
Seigo Nonaka
39ed6e7661
Merge "Update fullscreen state on hiding window."
2015-07-14 06:17:47 +00:00
Seigo Nonaka
93c47eab2b
Update fullscreen state on hiding window.
...
Need to update fullscreen state on hiding window as well as showing
window, otherwise IMM#isFullscreenWindow reports obsolete state after
hiding window by back key or device rotation.
Bug: 22238567
Change-Id: Ic8de161cd5d2ee161f32b9942cdc2c331ea4d48e
2015-07-14 15:08:52 +09:00
Paul Crowley
8ae629f6cb
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.
2015-07-13 23:51:03 +00:00
Paul Crowley
4e1174d9a7
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.
2015-07-13 23:50:58 +00:00
John Reck
72e8e0807a
am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev
...
* commit '074b3ceb847ba2d9c9795b730c54a27ba412f158':
Improve resource loading by ~3x
2015-07-13 23:36:26 +00:00
Aravind Akella
f61d30ccdc
am 42cae4ab: am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
...
* commit '42cae4aba7412a87acbf267a0c60f5847bbf13cf':
Log full class name of the client activating sensors for better debugging.
2015-07-13 23:36:07 +00:00
Chris Wren
500db3c10d
am d5b0f69a: am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
...
* commit 'd5b0f69a457db4622e7ee6f73695a32e6f8c96f4':
fix build by restoring deleted enum
2015-07-13 23:35:53 +00:00
Julia Reynolds
91941a57be
am 19fd8658: am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev
...
* commit '19fd86589b87faf8e243c6c33be17390867e67bb':
Remove personal/device group from sideloading screen.
2015-07-13 23:35:48 +00:00
Chris Wren
ea794192cf
am 2d8e0173: am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
...
* commit '2d8e01730390a66fbd9b4858b8ab6569ba50d622':
add new enums to MetricsConstans
2015-07-13 23:35:39 +00:00
Rubin Xu
474f987dd7
am f5d6d432: am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev
...
* commit 'f5d6d432af57722e951d88a420b189c45a243d4b':
Remove ExternalStorageFormatter
2015-07-13 23:35:27 +00:00
Billy Lau
0be2efb256
am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
...
* commit 'f028ba3db3d3b6478154952dbbd8ed7422ad14f6':
Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
2015-07-13 23:35:14 +00:00
Zhijun He
cf00a86461
am a9fc8aa3: am 4fb81253: Camera metadata: fix typos.
...
* commit 'a9fc8aa3c88e7b837be65abf6f3b0f3e2e9a4a1e':
Camera metadata: fix typos.
2015-07-13 23:35:09 +00:00
Raph Levien
073477a18e
am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev
...
* commit '93a2c97dc71b211de1e9e3a7a64aa301309f3308':
Improve Html.toHtml() documentation
2015-07-13 23:34:55 +00:00
Carlos Valdivia
4e976dd141
am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev
...
* commit 'cc3c93d30cd16597eb1e551d36237692cdb1299d':
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
2015-07-13 23:33:31 +00:00
Mady Mellor
441ad4df23
am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev
...
* commit '7fac4d6cc41cab81b2b2202725ae69782f9bcce9':
Fix: line slop shouldn't always increase / decrease by one line
2015-07-13 23:33:26 +00:00
Mady Mellor
9d4cd8cf48
am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev
...
* commit '24950db2768def06509e9bfd4ed6ecb47318f31d':
Fix line slop issue at end of line for Thai & CJK
2015-07-13 23:33:22 +00:00
Chris Craik
3b34b0061b
am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev
...
* commit 'be10a86620947bfee882c50ae725ceb10cbae98f':
Reduce cost of span type checking
2015-07-13 23:33:08 +00:00
John Reck
074b3ceb84
am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev
...
* commit 'f96d9c5421b7df1c60024a0928639e18c6d96b7b':
Improve resource loading by ~3x
2015-07-13 23:03:25 +00:00
Aravind Akella
42cae4aba7
am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
...
* commit '37511e35ae22ea88539f1137ea2f74c9cb17f60c':
Log full class name of the client activating sensors for better debugging.
2015-07-13 23:02:13 +00:00
Chris Wren
d5b0f69a45
am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
...
* commit '208934ff010cc2aff7d8fee9237d6cee0e5bb563':
fix build by restoring deleted enum
2015-07-13 23:01:57 +00:00
Julia Reynolds
19fd86589b
am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev
...
* commit 'fbd0a444e787c93ee8ef8741fcf24826a8619fcb':
Remove personal/device group from sideloading screen.
2015-07-13 23:01:53 +00:00
Chris Wren
2d8e017303
am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
...
* commit '4502bfb8fd5ddb15bf0cc9bfc631eda269621f29':
add new enums to MetricsConstans
2015-07-13 23:01:35 +00:00
