summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove Bitmap#getSkBitmapJohn Reck2015-05-0111-86/+88
* Move AssetAtlas off of SkBitmap*John Reck2015-05-016-125/+103
* Merge "A bunch more cleanups" into mnc-devJohn Reck2015-05-019-27/+25
|\
| * A bunch more cleanupsJohn Reck2015-04-309-27/+25
* | Merge "Device policy: use owner label instead of name" into mnc-devRobin Lee2015-05-012-11/+35
|\ \
| * | Device policy: use owner label instead of nameRobin Lee2015-04-302-11/+35
* | | AlarmManager: Reject non-olson timezones for targetSdk >= MNarayan Kamath2015-05-011-6/+37
* | | Merge "Fix a bug in ScanSettings constructor." into mnc-devWei Wang2015-05-011-1/+1
|\ \ \
| * | | Fix a bug in ScanSettings constructor.Wei Wang2015-05-011-1/+1
* | | | am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout.Gus Prevas2015-05-011-0/+2
|\ \ \ \
| * \ \ \ am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout.Gus Prevas2015-04-301-0/+2
| |\ \ \ \
| | * | | | Fixes velocity tracking bug in SwipeDismissLayout.Gus Prevas2015-04-301-0/+2
* | | | | | Merge "Honor Ble scanning settings from Settings UI." into mnc-devWei Wang2015-05-013-22/+22
|\ \ \ \ \ \
| * | | | | | Honor Ble scanning settings from Settings UI.Wei Wang2015-04-303-22/+22
| | |_|/ / / | |/| | | |
* | | | | | Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-devLorenzo Colitti2015-05-014-82/+84
|\ \ \ \ \ \
| * | | | | | Add a hidden method to clear NetworkCapabilities.Lorenzo Colitti2015-05-011-2/+17
| * | | | | | Fix javadoc error for requestNetwork.Lorenzo Colitti2015-05-011-12/+17
| * | | | | | Simplify network callback handling code.Lorenzo Colitti2015-05-011-64/+36
| * | | | | | Document and unhide CALLBACK_PRECHECK.Lorenzo Colitti2015-05-013-4/+14
* | | | | | | Merge "MediaPlayer: provide mime type for all track types" into mnc-devRobert Shih2015-05-011-10/+5
|\ \ \ \ \ \ \
| * | | | | | | MediaPlayer: provide mime type for all track typesRobert Shih2015-04-301-10/+5
* | | | | | | | Merge "[RenderScript] typo fix in BLAS, TRMM & TSMM" into mnc-devMiao Wang2015-05-011-10/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | [RenderScript] typo fix in BLAS, TRMM & TSMMMiao Wang2015-04-301-10/+10
* | | | | | | | | Merge "Fix typo. bug: b/20610710" into mnc-devtturney2015-05-011-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typo.tturney2015-04-291-1/+1
* | | | | | | | | | media: Hook up MediaPlayer and MediaSync to new settingsLajos Molnar2015-04-306-133/+283
* | | | | | | | | | Merge "Fix layoutlib build breakage" into mnc-devAlan Viverette2015-04-301-17/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix layoutlib build breakageAlan Viverette2015-04-301-17/+11
* | | | | | | | | | | Merge "Add handler parameter for callbacks." into mnc-devAndrew Lee2015-04-309-123/+507
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add handler parameter for callbacks.Andrew Lee2015-04-309-123/+507
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | am a1c7176b: am a03e2658: am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio...Rich Slogar2015-04-300-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | am a03e2658: am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updatesRich Slogar2015-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updatesRich Slogar2015-04-3011-91/+549
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updatesRich Slogar2015-04-3011-91/+549
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ am 2a3aa2d3: docs: studio 1.2 updatesRich Slogar2015-04-3011-91/+549
| | | | |\ \ \ \ \ \ \ \
* | | | | \ \ \ \ \ \ \ \ am 7fbde8f5: am 408aeb05: am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs:...Rich Slogar2015-04-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 408aeb05: am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 d...Rich Slogar2015-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" int...Rich Slogar2015-04-301-18/+19
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docsRich Slogar2015-04-301-18/+19
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docsRich Slogar2015-04-301-18/+19
| | | | |\ \ \ \ \ \ \ \ \
* | | | | \ \ \ \ \ \ \ \ \ am ac9c751d: am 62cfe97d: am 2653774a: am b874dc04: am 07aca646: Merge "docs:...Rich Slogar2015-04-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 62cfe97d: am 2653774a: am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0...Rich Slogar2015-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 2653774a: am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0 revision upd...Rich Slogar2015-04-301-0/+68
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lm...Rich Slogar2015-04-301-0/+68
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docsRich Slogar2015-04-301-0/+68
| | | | |\ \ \ \ \ \ \ \ \ \
* | | | | \ \ \ \ \ \ \ \ \ \ am 994d6ffe: am 7a258afa: am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs:...Rich Slogar2015-04-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | / / / / / / / | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 7a258afa: am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 r...Rich Slogar2015-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revision updat...Rich Slogar2015-04-303-5/+58
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-...Rich Slogar2015-04-303-5/+58
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docsRich Slogar2015-04-303-5/+58
| | | | |\ \ \ \ \ \ \ \ \ \