summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" in...Adam Lesinski2014-10-092-10/+3
|\
| * Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-devAdam Lesinski2014-10-082-10/+3
| |\
| | * Remove UsageEvents#resetToStart() as it doesn't workAdam Lesinski2014-10-082-10/+3
* | | am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-090-0/+0
|\ \ \ | |/ /
| * | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-082-3/+3
| |\ \
| | * | Import translations. DO NOT MERGEGeoff Mendal2014-10-082-3/+3
* | | | am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manche...Quddus Chong2014-10-091-1/+1
|\ \ \ \ | |/ / /
| * | | am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release t...Quddus Chong2014-10-081-1/+1
| |\ \ \
| | * \ \ am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.Quddus Chong2014-10-081-1/+1
| | |\ \ \
| | | * | | docs: Changed date of GMS v6.1 (Manchego) release to October 2014.Quddus Chong2014-10-081-1/+1
* | | | | | am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing ...Mike Lockwood2014-10-091-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds."...Mike Lockwood2014-10-081-0/+3
| |\ \ \ \ \
| | * | | | | bootanimation: Tweak parameters for pcm_open for playing boot sounds.Mike Lockwood2014-10-071-0/+3
* | | | | | | am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-devEino-Ville Talvala2014-10-094-484/+2086
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge changes Id09663d8,Ie88f3750 into lmp-devEino-Ville Talvala2014-10-084-484/+2086
| |\ \ \ \ \ \
| | * | | | | | Camera2: Docs cleanup, especially units and rangeEino-Ville Talvala2014-10-084-494/+1557
| | * | | | | | camera2: Update docs only for legacy devicesIgor Murashkin2014-10-034-21/+560
* | | | | | | | am 3dd06d90: Merge "Restored widget provider id not properly updated." into l...Svetoslav2014-10-091-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Restored widget provider id not properly updated." into lmp-devSvetoslav2014-10-081-2/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Restored widget provider id not properly updated.Svetoslav2014-10-081-2/+3
* | | | | | | | | am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-0929-50/+49
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-0829-50/+49
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Put in real "code" (aka marketing) name.Dianne Hackborn2014-10-0729-50/+49
* | | | | | | | | | am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-095-22/+125
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 4f133894: Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
* | | | | | | | | | am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-devJeff Sharkey2014-10-091-0/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Bring along more ApplicationInfo fields." into lmp-devJeff Sharkey2014-10-081-0/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bring along more ApplicationInfo fields.Jeff Sharkey2014-10-081-0/+6
* | | | | | | | | | | am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-081-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-081-1/+1
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
* | | | | | | | | | | Merge "Log exception when creating Activity in ActivityUnitTestCase." into lm...Filip Gruszczynski2014-10-081-4/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Log exception when creating Activity in ActivityUnitTestCase.Filip Gruszczynski2014-10-031-4/+9
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-082-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-082-3/+3
* | | | | | | | | | | | | am a5119ae7: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixe...Joe Fernandez2014-10-083-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-m...Joe Fernandez2014-10-083-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | / / / / / / / | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docsJoe Fernandez2014-10-083-2/+9
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "docs: Wear UI Lib training fixes" into klp-modular-docsJoe Fernandez2014-10-083-2/+9
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | docs: Wear UI Lib training fixesRicardo Cervera2014-10-033-2/+9
* | | | | | | | | | | | | am 2200f86f: All (er, L) is finally revealed.Dan Sandler2014-10-0817-260/+842
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | All (er, L) is finally revealed.Dan Sandler2014-10-0817-260/+842
* | | | | | | | | | | | | am b8a20e68: am 11b14e39: (-s ours) LayoutLib: Use ICU\'s line break algo. [D...Deepanshu Gupta2014-10-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 11b14e39: (-s ours) LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE]Deepanshu Gupta2014-10-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | LayoutLib: Use ICU's line break algo. [DO NOT MERGE]Deepanshu Gupta2014-10-082-0/+56
* | | | | | | | | | | | | am 318f0fe4: AudioService: Fix monitorRotation for landscape applicationsJon Eklund2014-10-081-8/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | AudioService: Fix monitorRotation for landscape applicationsJon Eklund2014-10-081-8/+34
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | am fdbbed60: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd updat...Rich Slogar2014-10-082-1/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-m...Rich Slogar2014-10-082-1/+40
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /