summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" int...Ricardo Cervera2014-03-261-1/+27
|\
| * Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-devRicardo Cervera2014-03-261-1/+27
| |\
| | * docs: Added release notes for Support Library 19.1.0Ricardo Cervera2014-03-241-1/+27
* | | am e59a2665: am 1b59f291: Merge "docs: Added Android Studio build system doc....Ricardo Cervera2014-03-269-0/+1067
|\ \ \ | |/ /
| * | am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docsRicardo Cervera2014-03-269-0/+1067
| |\ \
| | * \ Merge "docs: Added Android Studio build system doc." into klp-docsRicardo Cervera2014-03-269-0/+1067
| | |\ \
| | | * | docs: Added Android Studio build system doc.Ricardo Cervera2014-03-259-0/+1067
* | | | | Merge "Defer removal of activity until animation complete." into klp-modular-devCraig Mautner2014-03-261-1/+1
|\ \ \ \ \
| * | | | | Defer removal of activity until animation complete.Craig Mautner2014-03-251-1/+1
* | | | | | am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docsScott Main2014-03-251-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am ad52a4ce: Merge "fix broken link" into klp-docsScott Main2014-03-251-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "fix broken link" into klp-docsScott Main2014-03-251-1/+1
| | |\ \ \
| | | * | | fix broken linkScott Main2014-03-251-1/+1
* | | | | | am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2Ricardo Cervera2014-03-252-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 39aed838: docs: Amend SDK release notes for 22.6.2Ricardo Cervera2014-03-252-3/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | docs: Amend SDK release notes for 22.6.2Ricardo Cervera2014-03-252-3/+3
* | | | | | Merge "Remove all but two micro themes, light and dark." into klp-modular-devWill Haldean Brown2014-03-251-25/+1
|\ \ \ \ \ \
| * | | | | | Remove all but two micro themes, light and dark.Will Haldean Brown2014-03-251-25/+1
* | | | | | | Merge "Add RobotoCondensed-Light to build." into klp-modular-devJustin Koh2014-03-255-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Add RobotoCondensed-Light to build.Justin Koh2014-03-255-0/+15
* | | | | | | | am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22...Ricardo Cervera2014-03-255-51/+140
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into kl...Ricardo Cervera2014-03-255-51/+140
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docsRicardo Cervera2014-03-255-51/+140
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | docs: Added release notes for Android SDK 22.6.2Ricardo Cervera2014-03-255-51/+140
* | | | | | | | am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for ...Eino-Ville Talvala2014-03-251-4/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS s...Eino-Ville Talvala2014-03-251-4/+26
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range v...Eino-Ville Talvala2014-03-251-4/+26
| | |\ \ \ \ \ \ \
| | | * | | | | | | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-221-4/+26
* | | | | | | | | | am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73:...Craig Mautner2014-03-251-5/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637:...Craig Mautner2014-03-251-5/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec:...Craig Mautner2014-03-251-5/+9
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d:...Craig Mautner2014-03-251-5/+9
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b:...Craig Mautner2014-03-251-5/+9
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e:...Craig Mautner2014-03-251-5/+9
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow...Craig Mautner2014-03-251-5/+9
| | | | | | |\ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WH...Craig Mautner2014-03-251-5/+9
| | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to ...Craig Mautner2014-03-251-5/+9
| | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dial...Craig Mautner2014-03-251-5/+9
| | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-...Craig Mautner2014-03-251-5/+9
| | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ \ Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-devCraig Mautner2014-03-251-5/+9
| | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | * | | | | | | | Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogsCraig Mautner2014-03-221-5/+9
* | | | | | | | | | | | | | | | | | | | am 78373edb: am 837a4885: fix links and add note that adb forward must be rep...Scott Main2014-03-252-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 837a4885: fix links and add note that adb forward must be repeated bug: 13...Scott Main2014-03-252-5/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | fix links and add note that adb forward must be repeatedScott Main2014-03-252-5/+8
* | | | | | | | | | | | | | | | | | | | Merge commit '703169a3' into manualmergeCraig Mautner2014-03-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 2b2395f3: Merge "Don\'t wait for finishing animation when second display i...Craig Mautner2014-03-251-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Don't wait for finishing animation when second display is disconnected...Craig Mautner2014-03-251-2/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Don't wait for finishing animation when second display is disconnectedKoji Fukui2014-03-251-2/+7
* | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-modular-devBaligh Uddin2014-03-2556-1627/+2476
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-03-2456-1627/+2476