| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | | | | | * | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of c53ad4cd to jb-mr2-dev | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / /
| | | | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | | | | * | | | | | | | | | | | | | | | | | | | | am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved con... | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / /
| | | | | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | | | | | | * | | | | | | | | | | | | | | | | | | | am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for me... | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | | | | | | | |/| | | | | | | | | | | | | | | | | |
|
| | | | | | | | | * | | | | | | | | | | | | | | | | | | am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e... | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / /
| | | | | | | | | |/| | | | | | | | | | | | | | | | |
|
| | | | | | | | | | * | | | | | | | | | | | | | | | | | am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / /
| | | | | | | | | | |/| | | | | | | | | | | | | | | |
|
| | | | | | | | | | | * | | | | | | | | | | | | | | | | am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / /
| | | | | | | | | | | |/| | | | | | | | | | | | | | |
|
| | | | | | | | | | | | * | | | | | | | | | | | | | | | resolved conflicts for merge of 534f3e94 to jb-mr1-dev | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / /
| | | | | | | | | | | |/| | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | * | | | | | | | | | | | | | | am a3337bc7: Merge "Verify certificates" into jb-dev | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Verify certificates" into jb-dev | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | | | * | | | | | | | | | | | | | | Verify certificates | Marco Nelissen | 2014-03-17 | 2 | -0/+45 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to sat... | Vinit Deshapnde | 2014-03-20 | 3 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi reg... | Vinit Deshapnde | 2014-03-20 | 3 | -1/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory conce... | Vinit Deshapnde | 2014-03-20 | 3 | -1/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns | Vinit Deshapnde | 2014-03-19 | 3 | -1/+9 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO ... | Baligh Uddin | 2014-03-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev | Baligh Uddin | 2014-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-dev | Baligh Uddin | 2014-03-20 | 4 | -14/+14 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-03-19 | 4 | -14/+14 |
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples ... | Adam Koch | 2014-03-20 | 8 | -12/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 6398a86f: Merge "Point bitmaps training class to new samples directory." i... | Adam Koch | 2014-03-20 | 8 | -12/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Point bitmaps training class to new samples directory." into klp-docs | Adam Koch | 2014-03-20 | 8 | -12/+15 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Point bitmaps training class to new samples directory. | Adam Koch | 2014-03-20 | 8 | -12/+15 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from ... | Scott Main | 2014-03-20 | 16 | -245/+766 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a... | Scott Main | 2014-03-20 | 16 | -245/+766 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | update to wear docs. | Scott Main | 2014-03-19 | 16 | -245/+766 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback co... | Wei Wang | 2014-03-20 | 1 | -5/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/1... | Wei Wang | 2014-03-20 | 1 | -5/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 | Wei Wang | 2014-03-19 | 1 | -5/+21 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start... | Wei Wang | 2014-03-20 | 4 | -69/+131 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am da084104: Merge "DO NOT MERGE: Add status callback for start/stop adverti... | Wei Wang | 2014-03-20 | 4 | -69/+131 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE: Add status callback for start/stop advertising." into k... | Wei Wang | 2014-03-20 | 4 | -69/+131 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Add status callback for start/stop advertising. | Wei Wang | 2014-03-20 | 4 | -69/+131 |
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched... | Jim Miller | 2014-03-20 | 1 | -10/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath(... | Jim Miller | 2014-03-20 | 1 | -10/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowMa... | Jim Miller | 2014-03-20 | 1 | -10/+21 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 37050124: am a413a4ae: Fix the build. DO NOT MERGE | Jim Miller | 2014-03-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am a413a4ae: Fix the build. DO NOT MERGE | Jim Miller | 2014-03-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Fix the build. DO NOT MERGE | Jim Miller | 2014-03-19 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add idc config option for handling key repeats" into klp-modular-dev | Michael Wright | 2014-03-20 | 2 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Add idc config option for handling key repeats | Michael Wright | 2014-03-17 | 2 | -0/+11 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE... | Chris Craik | 2014-03-20 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev | Chris Craik | 2014-03-20 | 2 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev | Chris Craik | 2014-03-20 | 2 | -1/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix projection offset caching - DO NOT MERGE | Chris Craik | 2014-03-19 | 2 | -1/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dial... | Jim Miller | 2014-03-20 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck... | Jim Miller | 2014-03-20 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev | Jim Miller | 2014-03-20 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to fix a bug where SIM progress dialog gets stuck. | Jim Miller | 2014-03-13 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2:... | Victoria Lease | 2014-03-19 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d:... | Victoria Lease | 2014-03-19 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
