summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
Commit message (Expand)AuthorAgeFilesLines
* am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"Andreas Gampe2015-03-071-3/+1
|\
| * Frameworks/base: Remove unnecessary Pattern instanceAndreas Gampe2015-03-071-3/+1
* | am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode in...Benjamin Franz2015-02-121-7/+6
|\ \
| * \ am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.Benjamin Franz2015-02-121-7/+6
| |\ \
| | * | Fix the javadocs for lock task mode intents.Benjamin Franz2015-02-121-7/+6
* | | | Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39Pirama Arumuga Nainar2015-02-111-3/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Store compiled code in Context.getCodeCacheDir()Pirama Arumuga Nainar2015-02-101-3/+9
* | | | am fd523efc: Merge "Get the instruction set that the libraries of secondary A...Calin Juravle2015-02-102-2/+14
|\ \ \ \ | |/ / /
| * | | Merge "Get the instruction set that the libraries of secondary Abi is support...Calin Juravle2015-02-102-2/+14
| |\ \ \
| | * | | Get the instruction set that the libraries of secondary Abi is supported.jgu212014-12-172-2/+14
* | | | | am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPerm...Kenny Guy2015-02-061-3/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMet...Kenny Guy2015-02-061-3/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix mangled javadoc for setPermittedInputMethods.Kenny Guy2015-02-051-3/+3
* | | | | am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modu...Filip Gruszczynski2015-02-061-0/+41
|\ \ \ \ \ | |/ / / /
| * | | | Add wallpaper controlling system apis.Filip Gruszczynski2015-02-051-0/+41
| |/ / /
* | | | am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" i...Jose Lima2015-01-281-1/+3
|\ \ \ \ | |/ / /
| * | | Fix crash caused by disabling the Options panel on TVsJose Lima2015-01-281-1/+3
* | | | am fff84a23: Merge "Activity Transition: fix quick back after enter." into lm...George Mount2015-01-273-5/+37
|\ \ \ \ | |/ / /
| * | | Merge "Activity Transition: fix quick back after enter." into lmp-mr1-devGeorge Mount2015-01-273-5/+37
| |\ \ \
| | * | | Activity Transition: fix quick back after enter.George Mount2015-01-263-5/+37
* | | | | am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature f...Jose Lima2015-01-272-9/+21
|\ \ \ \ \ | |/ / / /
| * | | | Allow disabling the Options Pannel feature for TVsJose Lima2015-01-262-9/+21
| |/ / /
* | | | am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into...Jim Miller2015-01-221-4/+10
|\ \ \ \ | |/ / /
| * | | Clarify getTrustAgentConfiguration() documentation.Jim Miller2015-01-211-4/+10
* | | | Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-m...Dianne Hackborn2015-01-211-5/+12
|\ \ \ \ | |/ / /
| * | | Work on issue #18201239: ANRs in com.google.process.gapps:Dianne Hackborn2015-01-211-5/+12
* | | | am 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-m...Craig Mautner2015-01-161-0/+3
|\ \ \ \ | |/ / /
| * | | Merge "More debugging for bug 18201239." into lmp-mr1-devCraig Mautner2015-01-161-0/+3
| |\ \ \
| | * | | More debugging for bug 18201239.Craig Mautner2015-01-161-0/+3
* | | | | am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for me...Ricardo Cervera2015-01-161-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-161-0/+4
| |\ \ \ \
| | * \ \ \ am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-161-0/+4
| | |\ \ \ \
| | | * \ \ \ resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-161-0/+4
| | | |\ \ \ \
| | | | * \ \ \ am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(...Ricardo Cervera2015-01-161-0/+4
| | | | |\ \ \ \
| | | | | * | | | docs: Added info on noHistory and onActivityResult(). Bug: 13807256Ricardo Cervera2014-11-051-0/+4
| | * | | | | | | am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions...Christoph Studer2014-12-171-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fix MediaStyle docs mentioning 2 max actions in compact viewChristoph Studer2014-12-121-1/+1
* | | | | | | | | Merge commit '605eb79c9519307147fc1795d0eb155638a7f542' into manualmergeJeff Sharkey2015-01-155-0/+54
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Offer to detect non-SSL/TLS network traffic.Jeff Sharkey2015-01-155-0/+55
* | | | | | | | | am 41d54237: am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-devCraig Mautner2015-01-151-0/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge "Debug for bug 18201239." into lmp-mr1-devCraig Mautner2015-01-151-0/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Debug for bug 18201239.Craig Mautner2015-01-151-0/+2
* | | | | | | | | am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix redundant file backupsChristopher Tate2015-01-141-1/+0
| |/ / / / / / /
* | | | | | | | am 206d31f5: am 42ebaa43: Merge "Make documentation for cross-profile intent ...Nicolas Prevot2015-01-141-10/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Make documentation for cross-profile intent filters clearer.Nicolas Prevot2015-01-141-10/+10
* | | | | | | | am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buf...Craig Mautner2015-01-131-2/+17
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge "Prevent system server dump stuck by pipe buffer full."Craig Mautner2015-01-131-2/+17
| |\ \ \ \ \ \ \
| | * | | | | | | Prevent system server dump stuck by pipe buffer full.riddle_hsu2014-07-311-2/+17
* | | | | | | | | am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG recei...Olawale Ogunwale2015-01-124-7/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /