summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-devJeff Brown2014-05-211-7/+24
|\
| * Merge "I'm feeling the good vibrations." into klp-modular-devJeff Brown2014-05-211-7/+24
| |\
| | * I'm feeling the good vibrations.Jeff Brown2014-05-201-7/+24
* | | am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp...Jeff Brown2014-05-213-16/+74
|\ \ \ | |/ /
| * | Merge "Allow display timeouts to be set in config.xml." into klp-modular-devJeff Brown2014-05-213-16/+74
| |\ \ | | |/
| | * Allow display timeouts to be set in config.xml.Jeff Brown2014-05-203-16/+74
* | | am f7963fab: am c1bb79d9: am bb0b8449: Remove monetization image in edu guide...Dirk Dougherty2014-05-211-4/+0
|\ \ \ | |/ /
| * | am c1bb79d9: am bb0b8449: Remove monetization image in edu guidelines.Dirk Dougherty2014-05-211-4/+0
| |\ \
| | * \ am bb0b8449: Remove monetization image in edu guidelines.Dirk Dougherty2014-05-211-4/+0
| | |\ \
| | | * | Remove monetization image in edu guidelines.Dirk Dougherty2014-05-201-4/+0
* | | | | am 7ea18e1c: Add wearable notification extensions to frameworks/base.Griff Hazen2014-05-203-0/+948
|\ \ \ \ \ | |/ / / /
| * | | | Add wearable notification extensions to frameworks/base.Griff Hazen2014-05-203-0/+948
* | | | | am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"Jeff Brown2014-05-201-1/+1
|\ \ \ \ \
| * \ \ \ \ am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"Jeff Brown2014-05-201-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge "Fix NullException in QwertyKeyListener.KeyDown"Jeff Brown2014-05-201-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix NullException in QwertyKeyListener.KeyDownDmitry Tsyganyuk2012-08-291-1/+1
* | | | | | | | am 9e1379f1: Fix sdk docs build for framework from remote input api addition.Griff Hazen2014-05-202-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Fix sdk docs build for framework from remote input api addition.Griff Hazen2014-05-202-2/+2
* | | | | | | | am 5cadc3b0: Add RemoteInput, Grouping, and Extender to Notification api.Griff Hazen2014-05-203-14/+547
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add RemoteInput, Grouping, and Extender to Notification api.Griff Hazen2014-05-203-14/+547
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | am e0d6a6b0: Merge "Add PackagManager flag for WebView system feature." into ...Ben Murdoch2014-05-202-0/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Add PackagManager flag for WebView system feature." into klp-modular-devBen Murdoch2014-05-202-0/+9
| |\ \ \ \ \ \
| | * | | | | | Add PackagManager flag for WebView system feature.Ben Murdoch2014-05-192-0/+9
* | | | | | | | am 889814ce: resolved conflicts for merge of 32912e0a to stage-aosp-masterMichael Wright2014-05-201-0/+30
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | resolved conflicts for merge of 32912e0a to stage-aosp-masterMichael Wright2014-05-191-0/+30
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge "wallpaper: limit wallpaper width to sys.max_texture_size"Michael Wright2014-05-201-0/+30
| | |\ \ \ \ \ \
| | | * | | | | | wallpaper: limit wallpaper width to sys.max_texture_sizeDonghan Ryu2014-05-201-0/+30
| | |/ / / / / /
* | | | | | | | am 6071e45a: Merge "add a command to list all bonded devices" into klp-modula...Guang Zhu2014-05-201-0/+14
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge "add a command to list all bonded devices" into klp-modular-devGuang Zhu2014-05-201-0/+14
| |\ \ \ \ \ \ \
| | * | | | | | | add a command to list all bonded devicesGuang Zhu2014-05-191-0/+14
* | | | | | | | | am 9e58b46b: am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Servi...quddusc2014-05-193-15/+89
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services highlight...quddusc2014-05-193-15/+89
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing...quddusc2014-05-193-15/+89
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge "docs: Updated Google Play Services highlights and landing pages for Ke...quddusc2014-05-193-15/+89
| | | |\ \ \ \ \ \
| | | | * | | | | | docs: Updated Google Play Services highlights and landing pages for Kenafa (G...quddusc2014-05-093-15/+89
* | | | | | | | | | am 4b2b91d4: am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS K...Quddus Chong2014-05-19483-68229/+177637
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release...Quddus Chong2014-05-19483-68229/+177637
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docsQuddus Chong2014-05-19483-68229/+177637
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docsQuddus Chong2014-05-19483-68229/+177637
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | docs: Updated Javadoc for GMS Kenafa release.Quddus Chong2014-05-16483-68229/+177637
* | | | | | | | | | | am 6a7843c9: Merge "Override windowContentOverlay and windowBackground for Th...Mark Renouf2014-05-191-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" ...Mark Renouf2014-05-191-0/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Override windowContentOverlay and windowBackground for Theme.Micro.*Mark Renouf2014-05-191-0/+4
* | | | | | | | | | | | am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCach...Chris Craik2014-05-192-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"Chris Craik2014-05-192-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"Chris Craik2014-05-192-1/+21
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Use alpha channel instead of red in drawCachedGlyphBitmapDigish Pandya2014-05-152-1/+21
* | | | | | | | | | | | | am 7099995b: am a84d24c3: Merge "Extend support for nordic languages with Sami"Michael Wright2014-05-194-70/+165
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am a84d24c3: Merge "Extend support for nordic languages with Sami"Michael Wright2014-05-194-70/+165
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Extend support for nordic languages with Sami"Michael Wright2014-05-194-70/+165
| | |\ \ \ \ \ \ \ \ \ \ \