summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Annotate framework vibrate calls with stream hints.John Spurlock2014-03-2111-14/+27
* am 5c43c357: (-s ours) am c2221b93: (-s ours) am ecf3c574: (-s ours) am 826f3...Baligh Uddin2014-03-200-0/+0
|\
| * am c2221b93: (-s ours) am ecf3c574: (-s ours) am 826f3647: (-s ours) am d1650...Baligh Uddin2014-03-200-0/+0
| |\
| | * am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "I...Baligh Uddin2014-03-200-0/+0
| | |\
| | | * am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO ...Baligh Uddin2014-03-200-0/+0
| | | |\
| | | | * am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-03-200-0/+0
| | | | |\
| | | | | * Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-03-204-14/+14
| | | | | |\
| | | | | | * Import translations. DO NOT MERGEBaligh Uddin2014-03-194-14/+14
* | | | | | | am a3633c25: am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: bui...Colin Cross2014-03-201-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if ...Colin Cross2014-03-201-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl lib...Colin Cross2014-03-201-0/+3
| | |\ \ \ \ \
| | | * \ \ \ \ am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are no...Colin Cross2014-03-201-0/+3
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"Colin Cross2014-03-201-0/+3
| | | | |\ \ \ \ \
| | | | | * | | | | bootanimation: build 32-bit if 64-bit gl libraries are not availableColin Cross2014-03-191-0/+3
* | | | | | | | | | am c5640ea5: am 065b8fd1: am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point...Adam Koch2014-03-208-12/+15
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 065b8fd1: am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps trai...Adam Koch2014-03-208-12/+15
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to...Adam Koch2014-03-208-12/+15
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples ...Adam Koch2014-03-208-12/+15
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | | * | | | | | am 6398a86f: Merge "Point bitmaps training class to new samples directory." i...Adam Koch2014-03-208-12/+15
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge "Point bitmaps training class to new samples directory." into klp-docsAdam Koch2014-03-208-12/+15
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Point bitmaps training class to new samples directory.Adam Koch2014-03-208-12/+15
* | | | | | | | | | | | am 51daba32: am d4d42af5: am df00735c: am e02d5a20: am a32c4376: update to we...Scott Main2014-03-2016-245/+766
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am d4d42af5: am df00735c: am e02d5a20: am a32c4376: update to wear docs. incl...Scott Main2014-03-2016-245/+766
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am df00735c: am e02d5a20: am a32c4376: update to wear docs. includes javadoc ...Scott Main2014-03-2016-245/+766
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from ...Scott Main2014-03-2016-245/+766
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a...Scott Main2014-03-2016-245/+766
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | update to wear docs.Scott Main2014-03-1916-245/+766
* | | | | | | | | | | | am 34c40cab: (-s ours) am 331ef612: am 32779536: am 13bd8577: am c0384b6b: DO...Wei Wang2014-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 331ef612: am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move adveti...Wei Wang2014-03-201-5/+21
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up t...Wei Wang2014-03-201-5/+21
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback co...Wei Wang2014-03-201-5/+21
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/1...Wei Wang2014-03-201-5/+21
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / | | | | | |/| | | | | |
| | | | | * | | | | | | DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050Wei Wang2014-03-191-5/+21
* | | | | | | | | | | | am 323d8ef3: (-s ours) am 6c9385b1: am d10bc171: am 15a18d07: am da084104: Me...Wei Wang2014-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 6c9385b1: am d10bc171: am 15a18d07: am da084104: Merge "DO NOT MERGE: Add...Wei Wang2014-03-204-69/+131
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am d10bc171: am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callb...Wei Wang2014-03-204-69/+131
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start...Wei Wang2014-03-204-69/+131
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am da084104: Merge "DO NOT MERGE: Add status callback for start/stop adverti...Wei Wang2014-03-204-69/+131
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Merge "DO NOT MERGE: Add status callback for start/stop advertising." into k...Wei Wang2014-03-204-69/+131
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | DO NOT MERGE: Add status callback for start/stop advertising.Wei Wang2014-03-204-69/+131
* | | | | | | | | | | | | am 43f8ed56: (-s ours) am 8c5567ee: am bd33dc01: am 8e69abf8: am 46e63117: DO...Jim Miller2014-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 8c5567ee: am bd33dc01: am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory...Jim Miller2014-03-201-10/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am bd33dc01: am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused ...Jim Miller2014-03-201-10/+21
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched...Jim Miller2014-03-201-10/+21
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath(...Jim Miller2014-03-201-10/+21
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / /
| | | | | * | | | | | | | DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowMa...Jim Miller2014-03-201-10/+21
* | | | | | | | | | | | | am 3017a015: (-s ours) am e397d90f: am e0683de5: am 37050124: am a413a4ae: Fi...Jim Miller2014-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am e397d90f: am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGEJim Miller2014-03-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGEJim Miller2014-03-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am 37050124: am a413a4ae: Fix the build. DO NOT MERGEJim Miller2014-03-201-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /