Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev | Jeff Brown | 2014-05-21 | 1 | -7/+24 |
|\ | |||||
| * | Merge "I'm feeling the good vibrations." into klp-modular-dev | Jeff Brown | 2014-05-21 | 1 | -7/+24 |
| |\ | |||||
| | * | I'm feeling the good vibrations. | Jeff Brown | 2014-05-20 | 1 | -7/+24 |
* | | | am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp... | Jeff Brown | 2014-05-21 | 3 | -16/+74 |
|\ \ \ | |/ / | |||||
| * | | Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev | Jeff Brown | 2014-05-21 | 3 | -16/+74 |
| |\ \ | | |/ | |||||
| | * | Allow display timeouts to be set in config.xml. | Jeff Brown | 2014-05-20 | 3 | -16/+74 |
* | | | am f7963fab: am c1bb79d9: am bb0b8449: Remove monetization image in edu guide... | Dirk Dougherty | 2014-05-21 | 1 | -4/+0 |
|\ \ \ | |/ / | |||||
| * | | am c1bb79d9: am bb0b8449: Remove monetization image in edu guidelines. | Dirk Dougherty | 2014-05-21 | 1 | -4/+0 |
| |\ \ | |||||
| | * \ | am bb0b8449: Remove monetization image in edu guidelines. | Dirk Dougherty | 2014-05-21 | 1 | -4/+0 |
| | |\ \ | |||||
| | | * | | Remove monetization image in edu guidelines. | Dirk Dougherty | 2014-05-20 | 1 | -4/+0 |
* | | | | | am 7ea18e1c: Add wearable notification extensions to frameworks/base. | Griff Hazen | 2014-05-20 | 3 | -0/+948 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Add wearable notification extensions to frameworks/base. | Griff Hazen | 2014-05-20 | 3 | -0/+948 |
* | | | | | am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown" | Jeff Brown | 2014-05-20 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown" | Jeff Brown | 2014-05-20 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge "Fix NullException in QwertyKeyListener.KeyDown" | Jeff Brown | 2014-05-20 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix NullException in QwertyKeyListener.KeyDown | Dmitry Tsyganyuk | 2012-08-29 | 1 | -1/+1 |
* | | | | | | | | am 9e1379f1: Fix sdk docs build for framework from remote input api addition. | Griff Hazen | 2014-05-20 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Fix sdk docs build for framework from remote input api addition. | Griff Hazen | 2014-05-20 | 2 | -2/+2 |
* | | | | | | | | am 5cadc3b0: Add RemoteInput, Grouping, and Extender to Notification api. | Griff Hazen | 2014-05-20 | 3 | -14/+547 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Add RemoteInput, Grouping, and Extender to Notification api. | Griff Hazen | 2014-05-20 | 3 | -14/+547 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | am e0d6a6b0: Merge "Add PackagManager flag for WebView system feature." into ... | Ben Murdoch | 2014-05-20 | 2 | -0/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev | Ben Murdoch | 2014-05-20 | 2 | -0/+9 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add PackagManager flag for WebView system feature. | Ben Murdoch | 2014-05-19 | 2 | -0/+9 |
* | | | | | | | | am 889814ce: resolved conflicts for merge of 32912e0a to stage-aosp-master | Michael Wright | 2014-05-20 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | resolved conflicts for merge of 32912e0a to stage-aosp-master | Michael Wright | 2014-05-19 | 1 | -0/+30 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | Merge "wallpaper: limit wallpaper width to sys.max_texture_size" | Michael Wright | 2014-05-20 | 1 | -0/+30 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | wallpaper: limit wallpaper width to sys.max_texture_size | Donghan Ryu | 2014-05-20 | 1 | -0/+30 |
| | |/ / / / / / | |||||
* | | | | | | | | am 6071e45a: Merge "add a command to list all bonded devices" into klp-modula... | Guang Zhu | 2014-05-20 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge "add a command to list all bonded devices" into klp-modular-dev | Guang Zhu | 2014-05-20 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | add a command to list all bonded devices | Guang Zhu | 2014-05-19 | 1 | -0/+14 |
* | | | | | | | | | am 9e58b46b: am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Servi... | quddusc | 2014-05-19 | 3 | -15/+89 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services highlight... | quddusc | 2014-05-19 | 3 | -15/+89 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing... | quddusc | 2014-05-19 | 3 | -15/+89 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | Merge "docs: Updated Google Play Services highlights and landing pages for Ke... | quddusc | 2014-05-19 | 3 | -15/+89 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | docs: Updated Google Play Services highlights and landing pages for Kenafa (G... | quddusc | 2014-05-09 | 3 | -15/+89 |
* | | | | | | | | | | am 4b2b91d4: am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS K... | Quddus Chong | 2014-05-19 | 483 | -68229/+177637 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release... | Quddus Chong | 2014-05-19 | 483 | -68229/+177637 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs | Quddus Chong | 2014-05-19 | 483 | -68229/+177637 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs | Quddus Chong | 2014-05-19 | 483 | -68229/+177637 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | docs: Updated Javadoc for GMS Kenafa release. | Quddus Chong | 2014-05-16 | 483 | -68229/+177637 |
* | | | | | | | | | | | am 6a7843c9: Merge "Override windowContentOverlay and windowBackground for Th... | Mark Renouf | 2014-05-19 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" ... | Mark Renouf | 2014-05-19 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Override windowContentOverlay and windowBackground for Theme.Micro.* | Mark Renouf | 2014-05-19 | 1 | -0/+4 |
* | | | | | | | | | | | | am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCach... | Chris Craik | 2014-05-19 | 2 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap" | Chris Craik | 2014-05-19 | 2 | -1/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Merge "Use alpha channel instead of red in drawCachedGlyphBitmap" | Chris Craik | 2014-05-19 | 2 | -1/+21 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Use alpha channel instead of red in drawCachedGlyphBitmap | Digish Pandya | 2014-05-15 | 2 | -1/+21 |
* | | | | | | | | | | | | | am 7099995b: am a84d24c3: Merge "Extend support for nordic languages with Sami" | Michael Wright | 2014-05-19 | 4 | -70/+165 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am a84d24c3: Merge "Extend support for nordic languages with Sami" | Michael Wright | 2014-05-19 | 4 | -70/+165 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge "Extend support for nordic languages with Sami" | Michael Wright | 2014-05-19 | 4 | -70/+165 |
| | |\ \ \ \ \ \ \ \ \ \ \ |