summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to 319a20297d4926ac3641302f81c31028a...The Android Automerger2014-09-040-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ merge in lmp-release history after reset to 5c8a816e781753215be279986764dcdc4...The Android Automerger2014-09-030-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-release history after reset to fe3ba7fbc9177fe185a16ec11723b8e74...The Android Automerger2014-09-020-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to fe3ba7fbc9177fe185a16ec11723b8e74...The Android Automerger2014-09-010-0/+0
| | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to fe3ba7fbc9177fe185a16ec11723b8e74...The Android Automerger2014-08-310-0/+0
| | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to 016fc167aca1f31aa0b151e1312408fca...The Android Automerger2014-08-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-release history after reset to lmp-devThe Android Automerger2014-08-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-release history after reset to 717280c7c126b7d09ef9f61193798c63c...The Android Automerger2014-08-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to 717280c7c126b7d09ef9f61193798c63c...The Android Automerger2014-08-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to 717280c7c126b7d09ef9f61193798c63c...The Android Automerger2014-08-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to 717280c7c126b7d09ef9f61193798c63c...The Android Automerger2014-08-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to f1c2891a0029cca137ba3b7802e75e21d...The Android Automerger2014-08-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-release history after reset to 17b507bd0c1c4a999124b3d2ff81411fc...The Android Automerger2014-08-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-release history after reset to 4d0cd671d17a0b2b65609de12a120887a...The Android Automerger2014-08-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to 4d0cd671d17a0b2b65609de12a120887a...The Android Automerger2014-08-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to 4d0cd671d17a0b2b65609de12a120887a...The Android Automerger2014-08-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to c77d66804da50a92f94d88048446ca1dc...The Android Automerger2014-08-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to c77d66804da50a92f94d88048446ca1dc...The Android Automerger2014-08-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to d6df7362ab4b332a09d12358297056cfe...The Android Automerger2014-08-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-release history after reset to 17e3912628155bd850aca8b39824cd0c2...The Android Automerger2014-08-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to 17e3912628155bd850aca8b39824cd0c2...The Android Automerger2014-08-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to 17e3912628155bd850aca8b39824cd0c2...The Android Automerger2014-08-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to 49052fb7ac9fa54ddb9d312ba1baff645...The Android Automerger2014-08-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to 49052fb7ac9fa54ddb9d312ba1baff645...The Android Automerger2014-08-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to bb5d18dca81fe644761cb12e0e813e4a8...The Android Automerger2014-08-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to bb5d18dca81fe644761cb12e0e813e4a8...The Android Automerger2014-08-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to bb5d18dca81fe644761cb12e0e813e4a8...The Android Automerger2014-08-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to bb5d18dca81fe644761cb12e0e813e4a8...The Android Automerger2014-08-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to afb9296e531adcb5db49b115db4d91d15...The Android Automerger2014-07-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to afb9296e531adcb5db49b115db4d91d15...The Android Automerger2014-07-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to afb9296e531adcb5db49b115db4d91d15...The Android Automerger2014-07-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to afb9296e531adcb5db49b115db4d91d15...The Android Automerger2014-07-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-release history after reset to d54e6b19e4639412fbbb19bf478034634...The Android Automerger2014-07-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-release history after reset to 3815535c4a97fa25fb138d681ae69e7bc...The Android Automerger2014-07-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-release history after reset to 06a0ec0b97451c9b31afb646cb47c557b...The Android Automerger2014-07-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | new installation path of apks.Ying Wang2014-07-211-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update Build Tools version to <API>.0.2. DO NOT MERGE." into lmp-devXavier Ducrohet2014-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Build Tools version to <API>.0.2. DO NOT MERGE.Xavier Ducrohet2014-10-211-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp...Chenjie Luo2014-10-201-12/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify testrunner/test_defs.xml to delete obsolete cts testsChenjie Luo2014-10-201-12/+1
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-10-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-191-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-191-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Build Tools version to <API>.0.1. DO NOT MERGE.Xavier Ducrohet2014-10-171-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add additional samples for L to sdk.atreeTrevor Johns2014-10-171-1/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add browseable samples for L SDK releaseTrevor Johns2014-10-17666-0/+28858
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update sdk.atree and samples_source.prop_template for L SDK release" i...Trevor Johns2014-10-172-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update sdk.atree and samples_source.prop_template for L SDK releaseTrevor Johns2014-10-162-1/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sdk.atree: Fix typo and remove legacy BluetoothChat sampleTrevor Johns2014-10-161-2/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved conflicts for merge of '9875ec66' into lmp-devTrevor Johns2014-10-151-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |