summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
Commit message (Expand)AuthorAgeFilesLines
* am 4d9bd151: am fef1e0e7: Merge "Make Message.setAsynchronous() public." into...Jeff Brown2014-11-132-21/+25
|\
| * Merge "Make Message.setAsynchronous() public." into lmp-mr1-devJeff Brown2014-11-132-21/+25
| |\
| | * Make Message.setAsynchronous() public.Jeff Brown2014-11-112-21/+25
* | | am caf3cddd: am fabb70b2: Add reporting of Parcel memory/count.Dianne Hackborn2014-11-121-0/+6
|\ \ \ | |/ /
| * | Add reporting of Parcel memory/count.Dianne Hackborn2014-11-121-0/+6
* | | am 72f9838c: am 222722ee: Merge "Tell installd when boot completes." into lmp...Narayan Kamath2014-11-121-0/+14
|\ \ \ | |/ /
| * | Merge "Tell installd when boot completes." into lmp-mr1-devNarayan Kamath2014-11-121-0/+14
| |\ \ | | |/ | |/|
| | * Tell installd when boot completes.Narayan Kamath2014-11-111-0/+14
* | | am 32f7a6d8: Merge "Move device admin max screen off timeout to internal inte...Jeff Brown2014-11-122-1/+7
|\ \ \ | |/ /
| * | Merge "Move device admin max screen off timeout to internal interface." into ...Jeff Brown2014-11-112-1/+7
| |\ \ | | |/ | |/|
| | * Move device admin max screen off timeout to internal interface.Jeff Brown2014-11-062-1/+7
* | | am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-devAndres Morales2014-11-101-1/+0
|\ \ \ | |/ /
| * | Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-devAndres Morales2014-11-101-1/+0
| |\ \
| | * | Unhide DISALLOW_OUTGOING_BEAMAndres Morales2014-11-061-1/+0
* | | | am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application r...Sander Alewijnse2014-11-071-0/+18
|\ \ \ \ | |/ / /
| * | | Merge "Added the restrictions pending application restrictions key." into lmp...Sander Alewijnse2014-11-071-0/+18
| |\ \ \ | | |_|/ | |/| |
| | * | Added the restrictions pending application restrictions key.Sander Alewijnse2014-11-071-0/+18
* | | | am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into l...Dianne Hackborn2014-11-041-18/+19
|\ \ \ \ | |/ / /
| * | | Few more small meminfo improvements.Dianne Hackborn2014-11-031-18/+19
| | |/ | |/|
* | | am e333e674: Add a function to boost screen brightness temporarily. automerge...Jeff Brown2014-11-012-0/+23
|\ \ \ | |/ /
| * | am e333e674: Add a function to boost screen brightness temporarily.Jeff Brown2014-11-012-0/+23
| |\ \
| | * | Add a function to boost screen brightness temporarily.Jeff Brown2014-10-312-0/+23
* | | | am f2c90942: am bbb2c5b2: Merge "Add support for running 464xlat on wifi as w...Lorenzo Colitti2014-10-311-0/+5
|\ \ \ \ | |/ / /
| * | | Add support for running 464xlat on wifi as well.Lorenzo Colitti2014-10-301-0/+5
* | | | am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-devLorenzo Colitti2014-10-301-5/+5
|\ \ \ \ | |/ / /
| * | | Merge "Support more than one clatd at a time." into lmp-mr1-devLorenzo Colitti2014-10-291-5/+5
| |\ \ \
| | * | | Support more than one clatd at a time.Lorenzo Colitti2014-10-291-5/+5
| | | |/ | | |/|
* | | | am ebee8a4d: Merge "Replace minimum with maximum in method description." into...Nicolas Prevot2014-10-281-1/+1
|\ \ \ \ | |/ / /
| * | | Replace minimum with maximum in method description.Nicolas Prevot2014-10-281-1/+1
| |/ /
* | | am 2ea2bf28: am ed512c81: Merge "Fix issue #17948288: Improve accuracy of mem...Dianne Hackborn2014-10-181-1/+9
|\ \ \ | |/ /
| * | Fix issue #17948288: Improve accuracy of memory use reportingDianne Hackborn2014-10-171-1/+9
* | | am 9baa4506: am 3182987e: am bab9b48e: am 52476989: Merge "SDK only: hide the...Dianne Hackborn2014-10-171-0/+19
|\ \ \ | |/ /
| * | am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constan...Dianne Hackborn2014-10-171-0/+19
| |\ \ | | |/
| | * SDK only: hide the old L API version constant.Dianne Hackborn2014-10-161-0/+19
* | | am 56ae0447: am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-devDianne Hackborn2014-10-171-0/+5
|\ \ \ | |/ /
| * | Add API level for MR1.Dianne Hackborn2014-10-161-0/+5
| |/
* | am 6c0659e0: am 20791338: am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTG...Amith Yamasani2014-10-151-0/+1
|\ \ | |/
| * Hide DISALLOW_OUTGOING_BEAM APIAmith Yamasani2014-10-141-0/+1
* | am 8f6928f1: am e61e68d0: am 18d2d51e: am 7ea69880: Merge "Improve some docs,...Dianne Hackborn2014-10-103-3/+34
|\ \ | |/
| * Improve some docs, fix some debugging.Dianne Hackborn2014-10-093-3/+34
* | am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code"...Dianne Hackborn2014-10-103-8/+12
|\ \ | |/
| * Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-083-8/+12
| |\
| | * Put in real "code" (aka marketing) name.Dianne Hackborn2014-10-073-8/+12
* | | am 42f611f2: am 4797554a: am b86671f4: am 41bb3455: Merge "Set the default us...Amith Yamasani2014-10-071-0/+33
|\ \ \ | |/ /
| * | Merge "Set the default user restrictions to disallow calling and sms" into lm...Amith Yamasani2014-10-071-0/+33
| |\ \ | | |/ | |/|
| | * Set the default user restrictions to disallow calling and smsAmith Yamasani2014-10-061-0/+33
* | | am 42730c93: am b6f5cb3e: am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictM...John Spurlock2014-10-061-1/+2
|\ \ \ | |/ /
| * | Fix NPE in StrictMode handling.John Spurlock2014-10-061-1/+2
| |/
* | am e2776f02: am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT...Dianne Hackborn2014-10-031-1/+1
|\ \ | |/
| * Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...Dianne Hackborn2014-10-031-1/+1