| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge "Expose ContentProviderOperation type" | Brian Attwell | 2015-01-22 | 1 | -0/+16 |
|\ |
|
| * | Expose ContentProviderOperation type | Brian Attwell | 2015-01-22 | 1 | -0/+16 |
* | | Bring back voice interaction APIs. | Dianne Hackborn | 2015-01-21 | 1 | -2/+0 |
|/ |
|
* | am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved con... | Ricardo Cervera | 2015-01-16 | 1 | -0/+4 |
|\ |
|
| * | am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for me... | Ricardo Cervera | 2015-01-16 | 1 | -0/+4 |
| |\ |
|
| | * | am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev | Ricardo Cervera | 2015-01-16 | 1 | -0/+4 |
| | |\ |
|
| | | * | am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev | Ricardo Cervera | 2015-01-16 | 1 | -0/+4 |
| | | |\ |
|
| | | | * | resolved conflicts for merge of e8f6bd48 to lmp-dev | Ricardo Cervera | 2015-01-16 | 1 | -0/+4 |
| | | | |\ |
|
| | | | | * | am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(... | Ricardo Cervera | 2015-01-16 | 1 | -0/+4 |
| | | | | |\ |
|
| | | | | | * | am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 | Ricardo Cervera | 2015-01-16 | 1 | -0/+4 |
| | | | | | |\ |
|
| | | | | | | * | docs: Added info on noHistory and onActivityResult(). Bug: 13807256 | Ricardo Cervera | 2014-11-05 | 1 | -0/+4 |
* | | | | | | | | am fce232b4: am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump... | Dianne Hackborn | 2015-01-15 | 1 | -3/+5 |
|\ \ \ \ \ \ \ \
| |/ / / / / / / |
|
| * | | | | | | | am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stat... | Dianne Hackborn | 2015-01-15 | 1 | -3/+5 |
| |\ \ \ \ \ \ \
| | |/ / / / / / |
|
| | * | | | | | | Fix issue android-app doc, bump battery stats checkin version | Dianne Hackborn | 2015-01-14 | 1 | -3/+5 |
* | | | | | | | | Merge "Clean up TypedArray docs & formatting, remove coercion warnings" | Alan Viverette | 2015-01-14 | 2 | -103/+231 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Clean up TypedArray docs & formatting, remove coercion warnings | Alan Viverette | 2015-01-06 | 2 | -103/+231 |
* | | | | | | | | | am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG recei... | Olawale Ogunwale | 2015-01-13 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| / / / / / / /
| |/ / / / / / / |
|
| * | | | | | | | am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG recei... | Olawale Ogunwale | 2015-01-12 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | [ActivityManager] Distinguish FG or BG receiver finished | riddle_hsu | 2015-01-03 | 1 | -4/+6 |
* | | | | | | | | | Merge "Allow use of theme attributes in color state lists" | Alan Viverette | 2015-01-06 | 4 | -197/+539 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Allow use of theme attributes in color state lists | Alan Viverette | 2015-01-05 | 4 | -197/+539 |
* | | | | | | | | | | Remove null entries from constant state cache | Alan Viverette | 2015-01-05 | 1 | -1/+1 |
* | | | | | | | | | | resolve merge conflicts of 342e903 to master. | Michael Wright | 2014-12-30 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | am 95700457: am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceN... | Michael Wright | 2014-12-30 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Add MEDIA_PROJECTION_SERVICE to the ServiceName list. | Michael Wright | 2014-12-23 | 1 | -0/+1 |
* | | | | | | | | | | Iterate based on index, not key. | Jeff Sharkey | 2014-12-17 | 1 | -1/+1 |
* | | | | | | | | | | am 58d66c30: am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr... | Jay Shrauner | 2014-12-16 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / |
|
| * | | | | | | | | | am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev | Jay Shrauner | 2014-12-16 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / / |
|
| | * | | | | | | | | Fix NPE in Transport.applyBatch | Jay Shrauner | 2014-12-15 | 1 | -4/+6 |
* | | | | | | | | | | Merge "Prune the resource cache before adding new caches" | Alan Viverette | 2014-12-15 | 1 | -0/+37 |
|\ \ \ \ \ \ \ \ \ \
| |_|_|/ / / / / / /
|/| | | | | | | | | |
|
| * | | | | | | | | | Prune the resource cache before adding new caches | Alan Viverette | 2014-12-08 | 1 | -0/+37 |
* | | | | | | | | | | am 9b287368: am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.Inst... | Dianne Hackborn | 2014-12-10 | 1 | -9/+14 |
|\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| / / / / / / / /
| |/ / / / / / / / |
|
| * | | | | | | | | am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTe... | Dianne Hackborn | 2014-12-10 | 1 | -9/+14 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / / |
|
| | * | | | | | | | Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#... | Dianne Hackborn | 2014-12-09 | 1 | -9/+14 |
* | | | | | | | | | Merge "MIDI Manager work in progress" | Mike Lockwood | 2014-12-08 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | MIDI Manager work in progress | Mike Lockwood | 2014-12-08 | 1 | -0/+10 |
* | | | | | | | | | | am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capabil... | Eino-Ville Talvala | 2014-12-04 | 1 | -20/+0 |
|\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as ... | Eino-Ville Talvala | 2014-12-04 | 1 | -20/+0 |
| |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge "Revert "Camera: Add new capability flags as system features as well"" ... | Eino-Ville Talvala | 2014-12-03 | 1 | -20/+0 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | Revert "Camera: Add new capability flags as system features as well" | Eino-Ville Talvala | 2014-12-03 | 1 | -20/+0 |
* | | | | | | | | | | | am 3c8a439b: am e6333e51: am f696efa2: Merge "Fix issue #17948584: Applicatio... | Dianne Hackborn | 2014-12-04 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / |
|
| * | | | | | | | | | | am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and p... | Dianne Hackborn | 2014-12-04 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / /
| | | | / / / / / / /
| | |_|/ / / / / / /
| |/| | | | | | | | |
|
| | * | | | | | | | | Merge "Fix issue #17948584: Application crash and phone restart when app..." ... | Dianne Hackborn | 2014-12-03 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | | * | | | | | | | Fix issue #17948584: Application crash and phone restart when app... | Dianne Hackborn | 2014-12-03 | 1 | -0/+4 |
* | | | | | | | | | | Merge "Add BIND_IMPORTANT to @BindServiceFlags" | Tor Norbye | 2014-12-03 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| | | | | | | | | |
|
| * | | | | | | | | | Add BIND_IMPORTANT to @BindServiceFlags | Tor Norbye | 2014-12-02 | 1 | -2/+3 |
* | | | | | | | | | | am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, upd... | Alan Viverette | 2014-12-02 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | Deprecate one-arg getDrawableForDensity, update currents.txt | Alan Viverette | 2014-12-02 | 1 | -0/+4 |
* | | | | | | | | | | am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favo... | Alan Viverette | 2014-12-02 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / |
|
| * | | | | | | | | | Deprecate Resources.getDrawable(int) in favor of the two-arg version | Alan Viverette | 2014-12-02 | 1 | -0/+4 |
| | |/ / / / / / /
| |/| | | | | | | |
|