Narayan Kamath
|
fc5e0ba625
|
am b9f170ff: am b4db7923: Merge "Delete some obsolete test code."
* commit 'b9f170ff99a3ad25623bf20c77eb4f6173577c98':
Delete some obsolete test code.
|
2015-07-14 20:27:48 +00:00 |
|
Mathieu Chartier
|
82f91da700
|
am ad4a285a: am ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"
* commit 'ad4a285af619ea29f79dbe4da19061c49f24a8c9':
Change conditionallyCheckInstanceCounts to use countInstancesOfClasses
|
2015-07-14 20:27:42 +00:00 |
|
Adrian Roos
|
1d9a312c2c
|
am 3d2c2980: am a2231a75: am 9c013a21: Merge "Show charging speed on Keyguard" into mnc-dr-dev
* commit '3d2c298035c0d94f1bd590b04b5679f09b09f285':
Show charging speed on Keyguard
|
2015-07-14 20:01:15 +00:00 |
|
Adrian Roos
|
3d2c298035
|
am a2231a75: am 9c013a21: Merge "Show charging speed on Keyguard" into mnc-dr-dev
* commit 'a2231a754b92eb79e4b667c8b40fd0390ebb6dfb':
Show charging speed on Keyguard
|
2015-07-14 19:45:56 +00:00 |
|
Svetoslav
|
5edc6ffda7
|
am a6fc7f96: am 779e5e0e: am d72fc63a: am 46d1864c: Merge "Make get_accounts a runtime permissions again" into mnc-dev
* commit 'a6fc7f96b7e2d1afe27cead0b1f1bf30a5876612':
Make get_accounts a runtime permissions again
|
2015-07-14 19:39:22 +00:00 |
|
Adrian Roos
|
a2231a754b
|
am 9c013a21: Merge "Show charging speed on Keyguard" into mnc-dr-dev
* commit '9c013a211768c661f1142aba31c690daa76c66f7':
Show charging speed on Keyguard
|
2015-07-14 19:31:47 +00:00 |
|
Selim Cinek
|
d1f523840b
|
am b128187c: am 9a08a4ac: am 92c27550: am f5adce87: Merge "Removed logging for the empty keyguard" into mnc-dev
* commit 'b128187c4f6b1c51960ba5a178ad1fb3b40e1ca8':
Removed logging for the empty keyguard
|
2015-07-14 19:27:32 +00:00 |
|
Svetoslav
|
a6fc7f96b7
|
am 779e5e0e: am d72fc63a: am 46d1864c: Merge "Make get_accounts a runtime permissions again" into mnc-dev
* commit '779e5e0ed8489fe6faad35a061a82ad07618b5b3':
Make get_accounts a runtime permissions again
|
2015-07-14 19:24:44 +00:00 |
|
Adrian Roos
|
9c013a2117
|
Merge "Show charging speed on Keyguard" into mnc-dr-dev
|
2015-07-14 19:17:07 +00:00 |
|
Svetoslav
|
779e5e0ed8
|
am d72fc63a: am 46d1864c: Merge "Make get_accounts a runtime permissions again" into mnc-dev
* commit 'd72fc63aae69a7dbff4287dd56cc20d3f617277e':
Make get_accounts a runtime permissions again
|
2015-07-14 19:08:54 +00:00 |
|
Selim Cinek
|
b128187c4f
|
am 9a08a4ac: am 92c27550: am f5adce87: Merge "Removed logging for the empty keyguard" into mnc-dev
* commit '9a08a4ac9d6205b698497a941783c0421a9793e7':
Removed logging for the empty keyguard
|
2015-07-14 19:08:51 +00:00 |
|
Amit Mahajan
|
3ab0494732
|
am 4b842193: am adb156e0: am 336f18ba: am 51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev
* commit '4b842193d47ca9c12e57a2cd2d0238f41497e77c':
Add checks for READ_PRIVILEGED_PHONE_STATE.
|
2015-07-14 19:00:45 +00:00 |
|
Svetoslav
|
d72fc63aae
|
am 46d1864c: Merge "Make get_accounts a runtime permissions again" into mnc-dev
* commit '46d1864ceee7229cd7fe7bac80226c930539861d':
Make get_accounts a runtime permissions again
|
2015-07-14 18:52:21 +00:00 |
|
Selim Cinek
|
9a08a4ac9d
|
am 92c27550: am f5adce87: Merge "Removed logging for the empty keyguard" into mnc-dev
* commit '92c2755099d2bed07e87e454ac4c37ede7434110':
Removed logging for the empty keyguard
|
2015-07-14 18:52:01 +00:00 |
|
Amit Mahajan
|
4b842193d4
|
am adb156e0: am 336f18ba: am 51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev
* commit 'adb156e05aa2bf214f58e0a7924cc341fe4c327c':
Add checks for READ_PRIVILEGED_PHONE_STATE.
|
2015-07-14 18:46:06 +00:00 |
|
Svetoslav
|
46d1864cee
|
Merge "Make get_accounts a runtime permissions again" into mnc-dev
|
2015-07-14 18:42:08 +00:00 |
|
Wei Liu
|
ce47745ccb
|
am 650095f3: am 2fc9c124: Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev
* commit '650095f3c37ced7470f94177602c43521c7c1a87':
Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
|
2015-07-14 18:37:16 +00:00 |
|
Selim Cinek
|
92c2755099
|
am f5adce87: Merge "Removed logging for the empty keyguard" into mnc-dev
* commit 'f5adce87581bd3b7e8fd2846a85dbbf8c0dca939':
Removed logging for the empty keyguard
|
2015-07-14 18:36:57 +00:00 |
|
Amit Mahajan
|
adb156e05a
|
am 336f18ba: am 51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev
* commit '336f18ba2873935c892b693509d5ae7c7696aeb9':
Add checks for READ_PRIVILEGED_PHONE_STATE.
|
2015-07-14 18:29:26 +00:00 |
|
Selim Cinek
|
f5adce8758
|
Merge "Removed logging for the empty keyguard" into mnc-dev
|
2015-07-14 18:27:59 +00:00 |
|
Wei Liu
|
650095f3c3
|
am 2fc9c124: Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev
* commit '2fc9c1242266f02ee73e245f5ca8134781223bf6':
Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
|
2015-07-14 18:23:47 +00:00 |
|
Adrian Roos
|
7b04311d88
|
Show charging speed on Keyguard
Bug: 8099739
Change-Id: I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36
|
2015-07-14 18:22:39 +00:00 |
|
Jason Monk
|
6972b4c8a7
|
am d7f12b05: am 1b75e639: am 5086a970: am fe03a84b: Merge "Fix QS labels on language change" into mnc-dev
* commit 'd7f12b05dc799daed325d000f6e19a14619cc6c9':
Fix QS labels on language change
|
2015-07-14 18:22:02 +00:00 |
|
Marco Nelissen
|
b2fef7a81f
|
am f12612c8: am 48c78cfb: am c56668eb: am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev
* commit 'f12612c8e24cdccc390e69e7623af793c79b4c36':
Use original path if translated path doesn't exist
|
2015-07-14 18:21:57 +00:00 |
|
Craig Lafayette
|
a2113804f9
|
am 986b40ea: am 7df8b265: am d86ab3c5: am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev
* commit '986b40ea99d6fdbb836a52fe6a6991fbb1eeca01':
Prevent null allowableAccounts from crashing
|
2015-07-14 18:21:51 +00:00 |
|
Chris Craik
|
cd843caa37
|
am 230d8243: am 9f43ac77: am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
* commit '230d8243de5ef33a18c610a7b2f21fb6caa8e277':
Fix unsafety in SkiaShader storage, and texture unit accounting
|
2015-07-14 18:21:45 +00:00 |
|
Alex Klyubin
|
0c1df46303
|
am 9a3db4e5: am 21a0f80f: am 5eaf2412: am 10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev
* commit '9a3db4e5d528793cc9f9bc18dbed79bd6cc6b8f4':
Fix Android Keystore key factories to obey JCA contract.
|
2015-07-14 18:15:37 +00:00 |
|
Yohei Yukawa
|
a6b4eaf5bb
|
am 1e01d621: am 17dce343: am be27832b: am 12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev
* commit '1e01d62160b65ca326b015ba542a52fe22c442b7':
Allow FloatingToolbar to be outside of the attached window.
|
2015-07-14 18:15:27 +00:00 |
|
Ronghua Wu
|
0e1fc6bd9d
|
am 63488bc7: am 16567cf2: am 70250d35: am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev
* commit '63488bc788ac03adccc168f173337a51c0a86a6e':
media: Implement getAchievableFrameRatesFor with measured frame rate.
|
2015-07-14 18:15:19 +00:00 |
|
Andrei Stingaceanu
|
943b001c80
|
am b9384d5d: am 31ccc9f0: am a7e2ab6e: am 8af7432c: Merge "Fix "Select All" in extracted mode" into mnc-dev
* commit 'b9384d5d549f602dc4c898a16e413ed0069df713':
Fix "Select All" in extracted mode
|
2015-07-14 18:15:05 +00:00 |
|
Julia Reynolds
|
35ae7a0a8d
|
am f4874b74: am 2ed576fa: am 66b73dce: am f5e20ec3: Merge "Retrieve resources for apps, even if not installed for current user." into mnc-dev
* commit 'f4874b74fddbf3da1c7117fbc4f34c49d674223b':
Retrieve resources for apps, even if not installed for current user.
|
2015-07-14 18:15:00 +00:00 |
|
Andrei Stingaceanu
|
464f40065f
|
am dfa116e2: am 2e59771e: am 0e6360f4: am a9b9907f: Merge "Fix insertion handle disappearing in extract mode" into mnc-dev
* commit 'dfa116e2f71100eb56ff48cc233941f18c7a79cc':
Fix insertion handle disappearing in extract mode
|
2015-07-14 18:14:51 +00:00 |
|
Amit Mahajan
|
336f18ba28
|
am 51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev
* commit '51b4e97ae42fb789b7d1c9d4134ddaa7e2b27b11':
Add checks for READ_PRIVILEGED_PHONE_STATE.
|
2015-07-14 18:12:59 +00:00 |
|
Wei Liu
|
2fc9c12422
|
Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev
|
2015-07-14 18:08:38 +00:00 |
|
Jason Monk
|
d7f12b05dc
|
am 1b75e639: am 5086a970: am fe03a84b: Merge "Fix QS labels on language change" into mnc-dev
* commit '1b75e6391a271c8bf6105c71877dd583beca7a91':
Fix QS labels on language change
|
2015-07-14 18:04:46 +00:00 |
|
Marco Nelissen
|
f12612c8e2
|
am 48c78cfb: am c56668eb: am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev
* commit '48c78cfb9e9c055ee97be0aaac02832f758ee396':
Use original path if translated path doesn't exist
|
2015-07-14 18:04:40 +00:00 |
|
Craig Lafayette
|
986b40ea99
|
am 7df8b265: am d86ab3c5: am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev
* commit '7df8b2658faf91fdcd15a7aecbeb0146cf1d5ab3':
Prevent null allowableAccounts from crashing
|
2015-07-14 18:04:32 +00:00 |
|
Chris Craik
|
230d8243de
|
am 9f43ac77: am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
* commit '9f43ac777a0a5325002cabc37cb32a255eebe522':
Fix unsafety in SkiaShader storage, and texture unit accounting
|
2015-07-14 18:04:26 +00:00 |
|
Jason Monk
|
1b75e6391a
|
am 5086a970: am fe03a84b: Merge "Fix QS labels on language change" into mnc-dev
* commit '5086a970e786ac4629f5f275a5df25f6e24e1f61':
Fix QS labels on language change
|
2015-07-14 18:00:37 +00:00 |
|
Amit Mahajan
|
51b4e97ae4
|
Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev
|
2015-07-14 17:59:20 +00:00 |
|
Marco Nelissen
|
48c78cfb9e
|
am c56668eb: am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev
* commit 'c56668eb223fe45ff5c1e399d99943838320c407':
Use original path if translated path doesn't exist
|
2015-07-14 17:49:56 +00:00 |
|
Craig Lafayette
|
7df8b2658f
|
am d86ab3c5: am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev
* commit 'd86ab3c539cd548d54620edf8836546695dd7424':
Prevent null allowableAccounts from crashing
|
2015-07-14 17:49:51 +00:00 |
|
Chris Craik
|
9f43ac777a
|
am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
* commit 'e2a5c184e396b748e390672996ebeca25c2b9b83':
Fix unsafety in SkiaShader storage, and texture unit accounting
|
2015-07-14 17:49:47 +00:00 |
|
Jason Monk
|
5086a970e7
|
am fe03a84b: Merge "Fix QS labels on language change" into mnc-dev
* commit 'fe03a84bc6d59e9b09029cfa8800bd9ef8d85d18':
Fix QS labels on language change
|
2015-07-14 17:49:29 +00:00 |
|
Jason Monk
|
fe03a84bc6
|
Merge "Fix QS labels on language change" into mnc-dev
|
2015-07-14 17:40:23 +00:00 |
|
Marco Nelissen
|
c56668eb22
|
am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev
* commit '3ced96178b1b132705e773736cbb707a3a0cd951':
Use original path if translated path doesn't exist
|
2015-07-14 17:36:07 +00:00 |
|
Craig Lafayette
|
d86ab3c539
|
am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev
* commit '2f0116fa3ab2153188e43e87b194afae7e4efb81':
Prevent null allowableAccounts from crashing
|
2015-07-14 17:36:02 +00:00 |
|
Chris Craik
|
e2a5c184e3
|
am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
* commit '941bcedb4c03832cd54225217697c7b8cba6e07c':
Fix unsafety in SkiaShader storage, and texture unit accounting
|
2015-07-14 17:35:50 +00:00 |
|
Marco Nelissen
|
3ced96178b
|
Merge "Use original path if translated path doesn't exist" into mnc-dev
|
2015-07-14 17:30:06 +00:00 |
|
Amit Mahajan
|
7c5befa4a7
|
Add checks for READ_PRIVILEGED_PHONE_STATE.
Callers will have either PRIVILEGED or regular READ_PHONE_STATE.
Bug: 22468536
Change-Id: I60251f61250a975f4147b027d2539824a728e3b5
|
2015-07-14 10:26:00 -07:00 |
|