summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method...Joe Fernandez2014-11-014-3/+497
|\
| * am e8ad737d: docs: multidex - building apps with over 65K method referencesJoe Fernandez2014-11-014-3/+497
| |\
| | * docs: multidex - building apps with over 65K method referencesJoe Fernandez2014-10-314-3/+497
* | | am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docsJoe Fernandez2014-10-311-29/+34
|\ \ \ | |/ /
| * | am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docsJoe Fernandez2014-10-311-29/+34
| |\ \ | | |/
| | * Merge "docs:studio-updates-814v2" into lmp-docsJoe Fernandez2014-10-311-29/+34
| | |\
| | | * docs:studio-updates-814v2Rich Slogar2014-10-311-29/+34
* | | | am 307bcbe3: am 26bf2f7b: revise helpouts tags to use just one on each pagesmain@google.com2014-10-310-0/+0
|\ \ \ \ | |/ / /
| * | | am 26bf2f7b: revise helpouts tags to use just one on each pagesmain@google.com2014-10-310-0/+0
| |\ \ \ | | |/ /
| | * | revise helpouts tags to use just one on each pagesmain@google.com2014-10-315-5/+5
| | |/
* | | am 0da6b005: revise helpouts tags to use just one on each pagesmain@google.com2014-10-315-5/+5
|\ \ \ | |/ /
| * | revise helpouts tags to use just one on each pagesmain@google.com2014-10-315-5/+5
* | | am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyMa...Alex Klyubin2014-10-311-0/+7
|\ \ \ | |/ /
| * | am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into ...Alex Klyubin2014-10-311-0/+7
| |\ \ | | |/
| | * Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docsAlex Klyubin2014-10-311-0/+7
| | |\
| | | * Mention ECDHE_PSK bug in Javadoc of PskKeyManager.Alex Klyubin2014-10-301-0/+7
* | | | am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." i...Ricardo Cervera2014-10-314-7/+45
|\ \ \ \ | |/ / /
| * | | Merge "docs: Add links to Wear UI training from Design pages." into lmp-devRicardo Cervera2014-10-314-7/+45
| |\ \ \
| | * | | docs: Add links to Wear UI training from Design pages.Ricardo Cervera2014-10-214-7/+45
* | | | | am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docsJoe Fernandez2014-10-314-59/+80
|\ \ \ \ \ | |/ / / /
| * | | | am 81fcc85c: Merge "docs:studio-update-814" into lmp-docsJoe Fernandez2014-10-314-59/+80
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "docs:studio-update-814" into lmp-docsJoe Fernandez2014-10-314-59/+80
| | |\ \ \
| | | * | | docs:studio-update-814Rich Slogar2014-10-304-59/+80
| | | | |/ | | | |/|
* | | | | am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, retur...Mark Renouf2014-10-310-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am cf0f740e: (-s ours) If no display settings are matched, return the first o...Mark Renouf2014-10-310-0/+0
| |\ \ \ \
| | * | | | If no display settings are matched, return the first one. DO NOT MERGEMark Renouf2014-10-301-0/+3
* | | | | | am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen...Scott Rowe2014-10-301-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-...Scott Rowe2014-10-301-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c...Scott Rowe2014-10-301-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1...Scott Rowe2014-10-281-0/+0
* | | | | | am b5c5a0dc: am 7be03da0: (-s ours) Merge "Preserve explicit consumed state i...Mark Renouf2014-10-300-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSyst...Mark Renouf2014-10-300-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT M...Mark Renouf2014-10-301-1/+0
| | |\ \ \ \
| | | * | | | Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGEMark Renouf2014-10-301-1/+0
* | | | | | | am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985David Friedman2014-10-301-4/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e91c37de: Fixes wrongly nested braces. Bug: 17499985David Friedman2014-10-301-4/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Fixes wrongly nested braces.David Friedman2014-10-301-4/+3
* | | | | | | am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docsRicardo Cervera2014-10-301-7/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docsRicardo Cervera2014-10-301-7/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "docs: Two-page notification fix." into lmp-docsRicardo Cervera2014-10-301-7/+6
| | |\ \ \ \ \
| | | * | | | | docs: Two-page notification fix.Ricardo Cervera2014-10-291-7/+6
* | | | | | | | am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt,...kmccormick2014-10-290-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceede...kmccormick2014-10-290-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.kmccormick2014-10-299-102/+150
| | |/ / / / /
* | | | | | | am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate...kmccormick2014-10-299-102/+150
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bu...kmccormick2014-10-299-102/+150
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." int...kmccormick2014-10-299-102/+150
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular...kmccormick2014-10-299-102/+150
| | | |\ \ \ \
| | | | * | | | Doc update: deliv receipt, rate exceeded, bug fixes.kmccormick2014-10-299-102/+150
* | | | | | | | am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the...David Friedman2014-10-291-221/+124
|\ \ \ \ \ \ \ \ | |/ / / / / / /