summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Show charging speed on Keyguard" into mnc-dr-devAdrian Roos2015-07-147-8/+85
|\
| * Show charging speed on KeyguardAdrian Roos2015-07-147-8/+85
* | am 46d1864c: Merge "Make get_accounts a runtime permissions again" into mnc-devSvetoslav2015-07-141-1/+1
|\ \
| * \ Merge "Make get_accounts a runtime permissions again" into mnc-devSvetoslav2015-07-141-1/+1
| |\ \
| | * | Make get_accounts a runtime permissions againSvetoslav2015-07-131-1/+1
* | | | am f5adce87: Merge "Removed logging for the empty keyguard" into mnc-devSelim Cinek2015-07-144-53/+8
|\ \ \ \ | |/ / /
| * | | Merge "Removed logging for the empty keyguard" into mnc-devSelim Cinek2015-07-144-53/+8
| |\ \ \
| | * | | Removed logging for the empty keyguardSelim Cinek2015-07-134-53/+8
* | | | | am 51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-devAmit Mahajan2015-07-141-4/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-devAmit Mahajan2015-07-141-4/+10
| |\ \ \ \
| | * | | | Add checks for READ_PRIVILEGED_PHONE_STATE.Amit Mahajan2015-07-141-4/+10
* | | | | | am fe03a84b: Merge "Fix QS labels on language change" into mnc-devJason Monk2015-07-142-2/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix QS labels on language change" into mnc-devJason Monk2015-07-142-2/+18
| |\ \ \ \ \
| | * | | | | Fix QS labels on language changeJason Monk2015-07-142-2/+18
* | | | | | | am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into...Marco Nelissen2015-07-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Use original path if translated path doesn't exist" into mnc-devMarco Nelissen2015-07-141-1/+1
| |\ \ \ \ \ \
| | * | | | | | Use original path if translated path doesn't existMarco Nelissen2015-07-141-1/+1
* | | | | | | | am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-devCraig Lafayette2015-07-141-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Prevent null allowableAccounts from crashing" into mnc-devCraig Lafayette2015-07-141-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Prevent null allowableAccounts from crashingCraig Lafayette2015-07-141-1/+1
* | | | | | | | | am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit acco...Chris Craik2015-07-143-3/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into ...Chris Craik2015-07-143-3/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix unsafety in SkiaShader storage, and texture unit accountingChris Craik2015-07-133-3/+11
* | | | | | | | | | am 10633c96: Merge "Fix Android Keystore key factories to obey JCA contract."...Alex Klyubin2015-07-142-13/+23
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-devAlex Klyubin2015-07-142-13/+23
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix Android Keystore key factories to obey JCA contract.Alex Klyubin2015-07-132-13/+23
* | | | | | | | | | | am 12952c79: Merge "Allow FloatingToolbar to be outside of the attached windo...Yohei Yukawa2015-07-142-74/+91
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-devYohei Yukawa2015-07-142-74/+91
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Allow FloatingToolbar to be outside of the attached window.Yohei Yukawa2015-07-142-74/+91
* | | | | | | | | | | am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured...Ronghua Wu2015-07-141-2/+62
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "media: Implement getAchievableFrameRatesFor with measured frame rate."...Ronghua Wu2015-07-141-2/+62
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | media: Implement getAchievableFrameRatesFor with measured frame rate.Ronghua Wu2015-07-071-2/+62
* | | | | | | | | | | am 8af7432c: Merge "Fix "Select All" in extracted mode" into mnc-devAndrei Stingaceanu2015-07-141-12/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Fix "Select All" in extracted mode" into mnc-devAndrei Stingaceanu2015-07-141-12/+13
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix "Select All" in extracted modeAndrei Stingaceanu2015-07-141-12/+13
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
* | | | | | | | | | | am f5e20ec3: Merge "Retrieve resources for apps, even if not installed for cu...Julia Reynolds2015-07-141-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Retrieve resources for apps, even if not installed for current user." ...Julia Reynolds2015-07-141-1/+8
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Retrieve resources for apps, even if not installed for current user.Julia Reynolds2015-07-141-1/+8
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | am a9b9907f: Merge "Fix insertion handle disappearing in extract mode" into m...Andrei Stingaceanu2015-07-142-11/+22
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Fix insertion handle disappearing in extract mode" into mnc-devAndrei Stingaceanu2015-07-142-11/+22
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix insertion handle disappearing in extract modeAndrei Stingaceanu2015-07-132-11/+22
* | | | | | | | | | | am 77612940: Merge "Log NetworkRequestInfo to get more detailed history" into...Erik Kline2015-07-142-12/+33
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Log NetworkRequestInfo to get more detailed history" into mnc-devErik Kline2015-07-142-12/+33
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Log NetworkRequestInfo to get more detailed historyErik Kline2015-07-142-12/+33
| | |/ / / / / / / / /
* | | | | | | | | | | am 569ff225: Fix BluetoothSocket file descriptor leakZach Johnson2015-07-141-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fix BluetoothSocket file descriptor leakZach Johnson2015-07-141-0/+2
* | | | | | | | | | | am 8017c647: Fix buildSvet Ganov2015-07-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fix buildSvet Ganov2015-07-141-0/+1
* | | | | | | | | | | resolved conflicts for merge of 8cee6587 to mnc-dr-devIan Pedowitz2015-07-139-97/+247
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Teach storage appops." into mnc-devSvet Ganov2015-07-149-97/+247
| |\ \ \ \ \ \ \ \ \ \