summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | am 469fa946: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-291-1/+1
* | | | | | | | | | | | | am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mn...Jim Miller2015-08-291-31/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Run callbacks from fingerprintd through handler." into mnc-dr-devJim Miller2015-08-291-31/+62
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Run callbacks from fingerprintd through handler.Jim Miller2015-08-291-31/+62
* | | | | | | | | | | | | | am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into...Ian Pedowitz2015-08-291-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-devIan Pedowitz2015-08-291-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | / / / / / | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge "Show the ResolverActivity in dock mode" into mnc-devIan Pedowitz2015-08-291-6/+8
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Show the ResolverActivity in dock modeChristopher Tate2015-08-271-6/+8
| | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
* | | | | | | | | | | | | am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mn...Selim Cinek2015-08-2834-5/+1472
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Added animation for trusted to fingerprint error" into mnc-dr-devSelim Cinek2015-08-2834-5/+1472
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Added animation for trusted to fingerprint errorSelim Cinek2015-08-2834-5/+1472
* | | | | | | | | | | | | am acace94c: Fix race condition by guarding callbacksJorim Jaggi2015-08-281-10/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Fix race condition by guarding callbacksJorim Jaggi2015-08-281-10/+18
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-devRuben Brunk2015-08-281-32/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Fix DngCreator default crop calculations." into mnc-dr-devRuben Brunk2015-08-281-32/+22
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix DngCreator default crop calculations.Ruben Brunk2015-08-281-32/+22
* | | | | | | | | | | | | am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-devRobert Greenwalt2015-08-281-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-devRobert Greenwalt2015-08-281-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-devRobert Greenwalt2015-08-281-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Reduce CONNECTIVITY_CHANGE bcastsRobert Greenwalt2015-08-281-4/+6
* | | | | | | | | | | | | | am b774e554: Optimize fp touch to wake: Shortcut for report next drawJorim Jaggi2015-08-283-3/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Optimize fp touch to wake: Shortcut for report next drawJorim Jaggi2015-08-283-3/+27
* | | | | | | | | | | | | | am 9b2f9bcb: am 82d14d60: Merge "Crashing the system process is inadvisable" ...Chris Tate2015-08-281-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-devChris Tate2015-08-281-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "Crashing the system process is inadvisable" into mnc-devChris Tate2015-08-281-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Crashing the system process is inadvisableChristopher Tate2015-08-281-4/+6
| | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-devChong Zhang2015-08-281-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Fix deadlock when updating rotation" into mnc-dr-devChong Zhang2015-08-281-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix deadlock when updating rotationChong Zhang2015-08-281-1/+8
* | | | | | | | | | | | | | | am 71f15791: am d88152b4: Merge "Give shell permission to move apps." into mn...Jeff Sharkey2015-08-282-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | / / / / / / | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | am d88152b4: Merge "Give shell permission to move apps." into mnc-devJeff Sharkey2015-08-282-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Give shell permission to move apps." into mnc-devJeff Sharkey2015-08-282-3/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Give shell permission to move apps.Jeff Sharkey2015-08-282-3/+9
| | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
* | | | | | | | | | | | | | am 8b403e8c: am 3ab2e664: Merge "Docs: Localized DAC landing pages for M Prev...David Friedman2015-08-2828-203/+2706
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 3ab2e664: Merge "Docs: Localized DAC landing pages for M Preview, updated ...David Friedman2015-08-2828-203/+2706
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "Docs: Localized DAC landing pages for M Preview, updated for Dev Prev ...David Friedman2015-08-2828-203/+2706
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3.David Friedman2015-08-2728-203/+2706
* | | | | | | | | | | | | | | am 144020c9: am 02e5b0f2: Docs: Fixes a mistaken TOC item at top-right so it ...David Friedman2015-08-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 02e5b0f2: Docs: Fixes a mistaken TOC item at top-right so it now matches t...David Friedman2015-08-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Docs: Fixes a mistaken TOC item at top-right so it now matches the item it li...David Friedman2015-08-271-1/+1
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | am 34c08828: Merge "Fix NPE in AR hardware binding sequence. b/22772433" into...Anatol Pomazau2015-08-281-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Fix NPE in AR hardware binding sequence. b/22772433" into mnc-dr-devAnatol Pomazau2015-08-281-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Fix NPE in AR hardware binding sequence.destradaa2015-08-271-0/+6
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc...Ashish Sharma2015-08-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-devAshish Sharma2015-08-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "BatteryStats: Bump checkin version" into mnc-devAshish Sharma2015-08-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | BatteryStats: Bump checkin versionAdam Lesinski2015-08-201-1/+1
* | | | | | | | | | | | | | am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" i...Ajay Panicker2015-08-271-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-devAjay Panicker2015-08-271-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /