Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Annotate framework vibrate calls with stream hints. | John Spurlock | 2014-03-21 | 11 | -14/+27 |
* | am 5c43c357: (-s ours) am c2221b93: (-s ours) am ecf3c574: (-s ours) am 826f3... | Baligh Uddin | 2014-03-20 | 0 | -0/+0 |
|\ | |||||
| * | am c2221b93: (-s ours) am ecf3c574: (-s ours) am 826f3647: (-s ours) am d1650... | Baligh Uddin | 2014-03-20 | 0 | -0/+0 |
| |\ | |||||
| | * | am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "I... | Baligh Uddin | 2014-03-20 | 0 | -0/+0 |
| | |\ | |||||
| | | * | 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 a3633c25: am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: bui... | Colin Cross | 2014-03-20 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if ... | Colin Cross | 2014-03-20 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl lib... | Colin Cross | 2014-03-20 | 1 | -0/+3 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are no... | Colin Cross | 2014-03-20 | 1 | -0/+3 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" | Colin Cross | 2014-03-20 | 1 | -0/+3 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | bootanimation: build 32-bit if 64-bit gl libraries are not available | Colin Cross | 2014-03-19 | 1 | -0/+3 |
* | | | | | | | | | | am c5640ea5: am 065b8fd1: am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point... | Adam Koch | 2014-03-20 | 8 | -12/+15 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 065b8fd1: am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps trai... | Adam Koch | 2014-03-20 | 8 | -12/+15 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to... | Adam Koch | 2014-03-20 | 8 | -12/+15 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | 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 51daba32: am d4d42af5: am df00735c: am e02d5a20: am a32c4376: update to we... | Scott Main | 2014-03-20 | 16 | -245/+766 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | am d4d42af5: am df00735c: am e02d5a20: am a32c4376: update to wear docs. incl... | Scott Main | 2014-03-20 | 16 | -245/+766 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am df00735c: am e02d5a20: am a32c4376: update to wear docs. includes javadoc ... | Scott Main | 2014-03-20 | 16 | -245/+766 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | 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 34c40cab: (-s ours) am 331ef612: am 32779536: am 13bd8577: am c0384b6b: DO... | Wei Wang | 2014-03-20 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | am 331ef612: am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move adveti... | Wei Wang | 2014-03-20 | 1 | -5/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up t... | Wei Wang | 2014-03-20 | 1 | -5/+21 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | 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 323d8ef3: (-s ours) am 6c9385b1: am d10bc171: am 15a18d07: am da084104: Me... | Wei Wang | 2014-03-20 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | am 6c9385b1: am d10bc171: am 15a18d07: am da084104: Merge "DO NOT MERGE: Add... | Wei Wang | 2014-03-20 | 4 | -69/+131 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am d10bc171: am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callb... | Wei Wang | 2014-03-20 | 4 | -69/+131 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | 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 43f8ed56: (-s ours) am 8c5567ee: am bd33dc01: am 8e69abf8: am 46e63117: DO... | Jim Miller | 2014-03-20 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am 8c5567ee: am bd33dc01: am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory... | Jim Miller | 2014-03-20 | 1 | -10/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | am bd33dc01: am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused ... | Jim Miller | 2014-03-20 | 1 | -10/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | 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 3017a015: (-s ours) am e397d90f: am e0683de5: am 37050124: am a413a4ae: Fi... | Jim Miller | 2014-03-20 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am e397d90f: am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGE | Jim Miller | 2014-03-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGE | Jim Miller | 2014-03-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | am 37050124: am a413a4ae: Fix the build. DO NOT MERGE | Jim Miller | 2014-03-20 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / |