| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | | | | * | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3) | Trevor Johns | 2014-10-22 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | am 15677158: am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge... | Takeshi Hagikura | 2014-10-24 | 0 | -0/+0 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 ... | Takeshi Hagikura | 2014-10-24 | 0 | -0/+0 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modula... | Takeshi Hagikura | 2014-10-24 | 0 | -0/+0 | |
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 11e09fc0 to klp-modular-dev | Takeshi Hagikura | 2014-10-24 | 698 | -22247/+18 | |
| | | | | |\| | | | | | | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | | | | | | | | | | | | Deletes the wear samples that have been commited in the wrong place. | Takeshi Hagikura | 2014-10-22 | 698 | -22242/+18 | |
| | * | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: idegen: Skip directories named *.java when parsing source. | Sky Faber | 2014-10-24 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | am baf6829e: am f420ff0d: Add browseable samples for Clockwork Beryl | Trevor Johns | 2014-10-23 | 797 | -0/+34843 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | am f420ff0d: Add browseable samples for Clockwork Beryl | Trevor Johns | 2014-10-23 | 797 | -0/+34843 | |
| | | |\| | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | Add browseable samples for Clockwork Beryl | Trevor Johns | 2014-10-23 | 797 | -0/+34843 | |
| | * | | | | | | | | | | | | | | | | | | | | am f43722b7: am 4a5ce9ae: Merge "DO NOT MERGE: Package samples for Clockwork ... | Joe Fernandez | 2014-10-22 | 1 | -1/+1 | |
| | |\| | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | am 4a5ce9ae: Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21... | Joe Fernandez | 2014-10-22 | 1 | -1/+1 | |
| | | |\| | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev... | Joe Fernandez | 2014-10-22 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2) | Trevor Johns | 2014-10-22 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | am d74a44da: am de3f94a0: Merge "Deletes the wear samples that have been comm... | Joe Fernandez | 2014-10-22 | 698 | -22248/+18 | |
| | |\| | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | am de3f94a0: Merge "Deletes the wear samples that have been commited in the w... | Joe Fernandez | 2014-10-22 | 698 | -22248/+18 | |
| | | |\| | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | Merge "Deletes the wear samples that have been commited in the wrong place. U... | Joe Fernandez | 2014-10-22 | 698 | -22248/+18 | |
| | | | |\| | | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | Deletes the wear samples that have been commited in the wrong place. | Takeshi Hagikura | 2014-10-21 | 698 | -22248/+18 | |
| | | | | | |_|_|/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | am d42d6553: am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'u... | Joe Fernandez | 2014-10-22 | 1 | -1/+1 | |
| | |\| | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to ... | Joe Fernandez | 2014-10-22 | 1 | -1/+1 | |
| | | |\| | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | Merge "sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'" i... | Joe Fernandez | 2014-10-22 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | | sdk.atree: Move JobScheduler sample from 'ui/views' to 'background' | Trevor Johns | 2014-10-17 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Add color picker to cardview demo" into lmp-mr1-dev | Yigit Boyar | 2014-10-22 | 5 | -8/+94 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | Add color picker to cardview demo | Yigit Boyar | 2014-10-14 | 5 | -8/+94 | |
| | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | am 56be755b: am 0a871db0: Merge "Update Build Tools version to <API>.0.2. DO ... | Xavier Ducrohet | 2014-10-22 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | / / / / / / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | am 0a871db0: Merge "Update Build Tools version to <API>.0.2. DO NOT MERGE." i... | Xavier Ducrohet | 2014-10-21 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | am 86f364c8: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete ob... | Chenjie Luo | 2014-10-20 | 1 | -12/+1 | |
| | |\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts te... | Chenjie Luo | 2014-10-20 | 1 | -12/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | am 6ca01465: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO ... | Baligh Uddin | 2014-10-20 | 0 | -0/+0 | |
| | |\| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev | Baligh Uddin | 2014-10-20 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | am 568808dd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE | Baligh Uddin | 2014-10-19 | 0 | -0/+0 | |
| | |\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE | Baligh Uddin | 2014-10-19 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE. | Xavier Ducrohet | 2014-10-17 | 1 | -1/+1 | |
| | |\| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | am 36274ac5: Add additional samples for L to sdk.atree | Trevor Johns | 2014-10-17 | 1 | -1/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | am 6876a9cf: Add browseable samples for L SDK release | Trevor Johns | 2014-10-17 | 666 | -0/+28858 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L S... | Trevor Johns | 2014-10-17 | 2 | -1/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample | Trevor Johns | 2014-10-17 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev | Trevor Johns | 2014-10-16 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | (DO NOT MERGE) Fix sample SoftKeyboard preference activity | Tadashi G. Takaoka | 2014-10-15 | 1 | -0/+5 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev | Trevor Johns | 2014-10-09 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml | Chenjie Luo | 2014-10-08 | 1 | -23/+23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source r... | Tor Norbye | 2014-10-07 | 2 | -2/+32 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2c34d62a: Update LayoutLib API level to 12. | Deepanshu Gupta | 2014-10-07 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev | Christopher Ferris | 2014-10-05 | 1 | -4/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | am 0eac39db: 17782530: Annotations using retention policy source remain in .c... | Tor Norbye | 2014-10-04 | 5 | -24/+398 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev | Xavier Ducrohet | 2014-10-03 | 2 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Update Support7Demos for L appcompat" into lmp-mr1-dev | Chris Banes | 2014-10-03 | 16 | -25/+764 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Update Support7Demos for L appcompat | Chris Banes | 2014-10-02 | 16 | -25/+764 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Grant dev tools system permission to trigger media-scan service | Allen Shen | 2014-11-29 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Dev Tools: hide the icon! | Chirayu Desai | 2014-11-24 | 1 | -1/+1 | |
 |
index : development.git | |
| development |
| summaryrefslogtreecommitdiff |