summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "docs: build tools revision 22.0.0:" into lmp-mr1-devRich Slogar2015-03-091-1/+23
|\
| * docs: build tools revision 22.0.0:Rich Slogar2015-03-091-1/+23
* | am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle...Rich Slogar2015-03-091-1/+30
|\ \
| * \ am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1....Rich Slogar2015-03-091-1/+30
| |\ \
| | * \ am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release not...Rich Slogar2015-03-091-1/+30
| | |\ \
| | | * \ Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-...Rich Slogar2015-03-091-1/+30
| | | |\ \
| | | | * | docs: android plugin for gradle release 1.1.3 release notesRich Slogar2015-03-061-1/+30
* | | | | | am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear ...Luan Nguyen2015-03-094-0/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" i...Luan Nguyen2015-03-094-0/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docsLuan Nguyen2015-03-094-0/+9
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "docs: Add new partners to Wear index page" into lmp-docsLuan Nguyen2015-03-094-0/+9
| | | |\ \ \
| | | | * | | docs: Add new partners to Wear index pageLuan Nguyen2015-03-034-0/+9
* | | | | | | am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training t...Eric Gilmore2015-03-065-1300/+209
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and...Eric Gilmore2015-03-065-1300/+209
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 0bceaacf: Merge "Reworking geofencing training to new API and sample." int...Eric Gilmore2015-03-065-1300/+209
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Reworking geofencing training to new API and sample." into lmp-docsEric Gilmore2015-03-065-1300/+209
| | | |\ \ \ \
| | | | * | | | Reworking geofencing training to new API and sample.Eric Gilmore2015-03-065-1300/+209
* | | | | | | | am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typosGlenn Kasten2015-03-062-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 36d008c5: am 5afdc97f: Fix USB typosGlenn Kasten2015-03-062-5/+5
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 5afdc97f: Fix USB typosGlenn Kasten2015-03-062-5/+5
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fix USB typosGlenn Kasten2015-03-062-5/+5
* | | | | | | | Merge "Avoid crashing on startup when policy forbids lockscreen camera." into...Dan Sandler2015-03-062-1/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid crashing on startup when policy forbids lockscreen camera.Dan Sandler2015-03-032-1/+15
* | | | | | | | | am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing tr...Eric Gilmore2015-03-051-6/+6
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white ...Eric Gilmore2015-03-051-6/+6
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | am 87499b27: Merge "Re-fixing link, and removing trailing white space." into ...Eric Gilmore2015-03-051-6/+6
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge "Re-fixing link, and removing trailing white space." into lmp-docsEric Gilmore2015-03-051-6/+6
| | | |\ \ \ \ \ \
| | | | * | | | | | Re-fixing link, and removing trailing white space.Eric Gilmore2015-03-051-6/+6
* | | | | | | | | | am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fixRich Slogar2015-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 9f485e97: am 4aba69a8: docs: sdk tools date fixRich Slogar2015-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 4aba69a8: docs: sdk tools date fixRich Slogar2015-03-051-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | docs: sdk tools date fixRich Slogar2015-03-051-1/+1
| | | | |_|_|_|/ / | | | |/| | | | |
* | | | | | | | | am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other...smain@google.com2015-03-051-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" i...smain@google.com2015-03-051-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docssmain@google.com2015-03-051-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "add tags for wakelock and other API names" into lmp-docssmain@google.com2015-03-051-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | add tags for wakelock and other API namessmain@google.com2015-02-131-1/+1
* | | | | | | | | | am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/195038...Eric Gilmore2015-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp...Eric Gilmore2015-03-041-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docsEric Gilmore2015-03-041-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "Fixing broken link per b/19503824." into lmp-docsEric Gilmore2015-03-041-1/+1
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Fixing broken link per b/19503824.Eric Gilmore2015-03-031-1/+1
| | | | | |_|/ / / | | | | |/| | | |
* | | | | | | | | Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-devBart Sears2015-03-050-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit '83a63bac' into manualmergeCraig Mautner2015-03-040-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT M...Craig Mautner2015-03-044-32/+18
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lm...Craig Mautner2015-03-044-32/+18
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Do not make ActivityContainer available to apps. DO NOT MERGECraig Mautner2015-02-194-32/+18
* | | | | | | | | | | MediaProjectionPermissionActivity: Fix NPE.John Spurlock2015-03-041-2/+6
|/ / / / / / / / / /
* | | | | | | | | | am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed pro...Joe Fernandez2015-03-032-6/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc ...Joe Fernandez2015-03-032-6/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /