summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
Commit message (Expand)AuthorAgeFilesLines
* am fce232b4: am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump...Dianne Hackborn2015-01-151-3/+5
|\
| * am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stat...Dianne Hackborn2015-01-151-3/+5
| |\
| | * Fix issue android-app doc, bump battery stats checkin versionDianne Hackborn2015-01-141-3/+5
* | | Merge "Clean up TypedArray docs & formatting, remove coercion warnings"Alan Viverette2015-01-142-103/+231
|\ \ \
| * | | Clean up TypedArray docs & formatting, remove coercion warningsAlan Viverette2015-01-062-103/+231
* | | | am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG recei...Olawale Ogunwale2015-01-131-4/+6
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG recei...Olawale Ogunwale2015-01-121-4/+6
| |\ \
| | * | [ActivityManager] Distinguish FG or BG receiver finishedriddle_hsu2015-01-031-4/+6
* | | | Merge "Allow use of theme attributes in color state lists"Alan Viverette2015-01-064-197/+539
|\ \ \ \
| * | | | Allow use of theme attributes in color state listsAlan Viverette2015-01-054-197/+539
* | | | | Remove null entries from constant state cacheAlan Viverette2015-01-051-1/+1
* | | | | resolve merge conflicts of 342e903 to master.Michael Wright2014-12-301-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 95700457: am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceN...Michael Wright2014-12-301-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Add MEDIA_PROJECTION_SERVICE to the ServiceName list.Michael Wright2014-12-231-0/+1
* | | | | Iterate based on index, not key.Jeff Sharkey2014-12-171-1/+1
* | | | | am 58d66c30: am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr...Jay Shrauner2014-12-161-4/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-devJay Shrauner2014-12-161-4/+6
| |\ \ \ \ | | |/ / /
| | * | | Fix NPE in Transport.applyBatchJay Shrauner2014-12-151-4/+6
* | | | | Merge "Prune the resource cache before adding new caches"Alan Viverette2014-12-151-0/+37
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Prune the resource cache before adding new cachesAlan Viverette2014-12-081-0/+37
* | | | | am 9b287368: am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.Inst...Dianne Hackborn2014-12-101-9/+14
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTe...Dianne Hackborn2014-12-101-9/+14
| |\ \ \ | | |/ /
| | * | Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...Dianne Hackborn2014-12-091-9/+14
* | | | Merge "MIDI Manager work in progress"Mike Lockwood2014-12-081-0/+10
|\ \ \ \
| * | | | MIDI Manager work in progressMike Lockwood2014-12-081-0/+10
* | | | | am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capabil...Eino-Ville Talvala2014-12-041-20/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as ...Eino-Ville Talvala2014-12-041-20/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Revert "Camera: Add new capability flags as system features as well"" ...Eino-Ville Talvala2014-12-031-20/+0
| | |\ \ \
| | | * | | Revert "Camera: Add new capability flags as system features as well"Eino-Ville Talvala2014-12-031-20/+0
* | | | | | am 3c8a439b: am e6333e51: am f696efa2: Merge "Fix issue #17948584: Applicatio...Dianne Hackborn2014-12-041-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and p...Dianne Hackborn2014-12-041-0/+4
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Merge "Fix issue #17948584: Application crash and phone restart when app..." ...Dianne Hackborn2014-12-031-0/+4
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix issue #17948584: Application crash and phone restart when app...Dianne Hackborn2014-12-031-0/+4
* | | | | Merge "Add BIND_IMPORTANT to @BindServiceFlags"Tor Norbye2014-12-031-2/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add BIND_IMPORTANT to @BindServiceFlagsTor Norbye2014-12-021-2/+3
* | | | | am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, upd...Alan Viverette2014-12-021-0/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Deprecate one-arg getDrawableForDensity, update currents.txtAlan Viverette2014-12-021-0/+4
* | | | | am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favo...Alan Viverette2014-12-021-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Deprecate Resources.getDrawable(int) in favor of the two-arg versionAlan Viverette2014-12-021-0/+4
| | |/ / | |/| |
* | | | am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-021-1/+15
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-021-1/+15
| |\ \
| | * | RRO: reintroduce lost ResTable insert of assetsMårten Kongstad2014-11-071-1/+15
* | | | am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageS...Adam Lesinski2014-11-251-2/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Make the Context service constant for UsageStats public" into lmp-mr1-devAdam Lesinski2014-11-251-2/+1
| |\ \ \
| | * | | Make the Context service constant for UsageStats publicAdam Lesinski2014-11-241-2/+1
* | | | | am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDra...Alan Viverette2014-11-251-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-devAlan Viverette2014-11-241-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Check for null drawable in theme-less getDrawable()Alan Viverette2014-11-241-1/+1
* | | | | am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." in...Jeff Sharkey2014-11-253-18/+79
|\ \ \ \ \ | |/ / / /
| * | | | Introduce revision codes for split APKs.Jeff Sharkey2014-11-243-18/+79
generated by cgit v1.1 at 2025-03-13 21:32:10 +0000