| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes woul... | Adam Lesinski | 2014-12-11 | 2 | -3/+25 |
| |\ | |||||
| | * | am c7801877: Merge "Fix issue where non-resource attributes would cause obtai... | Adam Lesinski | 2014-12-10 | 2 | -3/+25 |
| | |\ | |||||
| | | * | Merge "Fix issue where non-resource attributes would cause obtainStyleAttribu... | Adam Lesinski | 2014-12-10 | 2 | -3/+25 |
| | | |\ | |||||
| | | | * | Fix issue where non-resource attributes would cause obtainStyleAttributes to ... | Adam Lesinski | 2014-12-10 | 2 | -3/+25 |
| * | | | | am 65c08ec8: am 4ef9edeb: Merge "Handle policy change while keyguard disabled... | Jason Monk | 2014-12-11 | 1 | -16/+29 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr... | Jason Monk | 2014-12-10 | 1 | -16/+29 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev | Jason Monk | 2014-12-10 | 1 | -16/+29 |
| | | |\ \ | |||||
| | | | * | | Handle policy change while keyguard disabled | Jason Monk | 2014-12-09 | 1 | -16/+29 |
| * | | | | | resolve merge conflicts of ed211b9 to lmp-mr1-dev-plus-aosp. | Chris Craik | 2014-12-10 | 4 | -8/+19 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | am f441557d: Merge "Fix frame-allocated path lifecycles" into lmp-mr1-dev | Chris Craik | 2014-12-10 | 4 | -8/+19 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge "Fix frame-allocated path lifecycles" into lmp-mr1-dev | Chris Craik | 2014-12-10 | 4 | -8/+19 |
| | | |\ \ \ | |||||
| | | | * | | | Fix frame-allocated path lifecycles | Chris Craik | 2014-12-10 | 4 | -8/+19 |
| * | | | | | | am a96ba381: Merge "Only add successfully bound profile services to mProfileS... | Benjamin Franz | 2014-12-10 | 1 | -14/+17 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | am a96ba381: Merge "Only add successfully bound profile services to mProfileS... | Benjamin Franz | 2014-12-10 | 1 | -14/+17 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | Merge "Only add successfully bound profile services to mProfileServices." int... | Benjamin Franz | 2014-12-10 | 1 | -14/+17 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Only add successfully bound profile services to mProfileServices. | Benjamin Franz | 2014-12-10 | 1 | -14/+17 |
| * | | | | | | | am 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug... | Joe Fernandez | 2014-12-10 | 1 | -9/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug... | Joe Fernandez | 2014-12-10 | 1 | -9/+1 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for deb... | Joe Fernandez | 2014-12-10 | 1 | -9/+1 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio... | Joe Fernandez | 2014-12-10 | 1 | -9/+1 |
| | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ | am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs | Joe Fernandez | 2014-12-10 | 1 | -9/+1 |
| | | | | |\ \ \ \ \ | |||||
| | | | | | * \ \ \ \ | Merge "docs: update debug menu for debugging-studio" into lmp-docs | Joe Fernandez | 2014-12-10 | 1 | -9/+1 |
| | | | | | |\ \ \ \ \ | |||||
| | | | | | | * | | | | | docs: update debug menu for debugging-studio | Rich Slogar | 2014-12-10 | 1 | -9/+1 |
| * | | | | | | | | | | | am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic ... | Joe Fernandez | 2014-12-10 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic ... | Joe Fernandez | 2014-12-10 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into l... | Joe Fernandez | 2014-12-10 | 1 | -2/+3 |
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | | am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs | Joe Fernandez | 2014-12-10 | 1 | -2/+3 |
| | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | |||||
| | | | | * | | | | | | | am 3454091d: Merge "docs:studio basic links" into lmp-docs | Joe Fernandez | 2014-12-10 | 1 | -2/+3 |
| | | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | |||||
| | | | | | * | | | | | | Merge "docs:studio basic links" into lmp-docs | Joe Fernandez | 2014-12-10 | 1 | -2/+3 |
| | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | docs:studio basic links | Rich Slogar | 2014-12-10 | 1 | -2/+3 |
| * | | | | | | | | | | | | am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s int... | Svet Ganov | 2014-12-10 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s int... | Svet Ganov | 2014-12-10 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | Merge "Ignore accessibility overlay when computing window's interactive regio... | Svet Ganov | 2014-12-10 | 1 | -2/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |||||
| | | | * | | | | | | | | | Ignore accessibility overlay when computing window's interactive region. | Svet Ganov | 2014-12-09 | 1 | -2/+3 |
| * | | | | | | | | | | | | am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 ... | Luan Nguyen | 2014-12-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 ... | Luan Nguyen | 2014-12-10 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in... | Luan Nguyen | 2014-12-10 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps | Luan Nguyen | 2014-12-10 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | |||||
| | | | | * | | | | | | | | am 258da738: docs: Fix text on step 5 of the opt-in steps | Luan Nguyen | 2014-12-10 | 1 | -1/+1 |
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | | | |||||
| | | | | | * | | | | | | | docs: Fix text on step 5 of the opt-in steps | Luan Nguyen | 2014-12-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled... | John Spurlock | 2014-12-10 | 2 | -15/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled... | John Spurlock | 2014-12-10 | 2 | -15/+31 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | Merge "NoMan: Apply audio restrictions when effects are disabled by listeners... | John Spurlock | 2014-12-10 | 2 | -15/+31 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | NoMan: Apply audio restrictions when effects are disabled by listeners. | John Spurlock | 2014-12-10 | 2 | -15/+31 |
| * | | | | | | | | | | | | | am d6372242: Merge "Further work on issue #18640385: Add procstats test mode"... | Dianne Hackborn | 2014-12-10 | 2 | -3/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | am d6372242: Merge "Further work on issue #18640385: Add procstats test mode"... | Dianne Hackborn | 2014-12-10 | 2 | -3/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | Merge "Further work on issue #18640385: Add procstats test mode" into lmp-mr1... | Dianne Hackborn | 2014-12-10 | 2 | -3/+16 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | Further work on issue #18640385: Add procstats test mode | Dianne Hackborn | 2014-12-10 | 2 | -3/+16 |
| * | | | | | | | | | | | | | | am 5431d1e9: (-s ours) am 2bb00d52: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2014-12-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | am 5431d1e9: (-s ours) am 2bb00d52: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2014-12-10 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |