summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 4186f85d: am 28e000ef: Merge "Remove debugging for b6829431." into jb-mr1-devCraig Mautner2012-08-011-8/+5
|\
| * Merge "Remove debugging for b6829431." into jb-mr1-devCraig Mautner2012-08-011-8/+5
| |\
| | * Remove debugging for b6829431.Craig Mautner2012-08-011-8/+5
* | | am 5d89b70a: am 413ab3a5: Merge "Improve gradients" into jb-mr1-devRomain Guy2012-07-311-8/+38
|\ \ \ | |/ /
| * | Merge "Improve gradients" into jb-mr1-devRomain Guy2012-07-311-8/+38
| |\ \
| | * | Improve gradientsRomain Guy2012-07-311-8/+38
* | | | am 00840827: am 40e5df95: Merge "Make AtomicFile a public API. It\'s about t...Dianne Hackborn2012-07-314-3/+244
|\ \ \ \ | |/ / /
| * | | Merge "Make AtomicFile a public API. It's about time!" into jb-mr1-devDianne Hackborn2012-07-314-3/+244
| |\ \ \
| | * | | Make AtomicFile a public API. It's about time!Dianne Hackborn2012-07-314-3/+244
* | | | | am 37f0fbf3: am 24d19fb6: Revert "API to adjust network stats."Jeff Sharkey2012-07-312-31/+0
|\ \ \ \ \ | |/ / / /
| * | | | Revert "API to adjust network stats."Jeff Sharkey2012-07-312-31/+0
| | |/ / | |/| |
* | | | am 015b2c1e: am 8ab8fbbf: Merge "Don\'t let ScrollView intercept touch events...Adam Powell2012-07-311-0/+7
|\ \ \ \ | |/ / /
| * | | Don't let ScrollView intercept touch events if it can't scroll.Adam Powell2012-07-311-0/+7
* | | | am 861f6fe9: am bccda0ae: am 194da0b8: am a39fdd11: Merge "Fix AccountManager...Kenny Root2012-07-311-0/+4
|\ \ \ \ | |/ / /
| * | | am 194da0b8: am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-devKenny Root2012-07-311-0/+4
| |\ \ \
| | * \ \ am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-devKenny Root2012-07-311-0/+4
| | |\ \ \
| | | * \ \ Merge "Fix AccountManagerServiceTest" into jb-devKenny Root2012-07-311-0/+4
| | | |\ \ \
| | | | * | | Fix AccountManagerServiceTestKenny Root2012-07-311-0/+4
* | | | | | | am ffbacd8c: am fba3bf97: Merge "Improve Toast RTL support" into jb-mr1-devFabrice Di Meglio2012-07-311-6/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Improve Toast RTL support" into jb-mr1-devFabrice Di Meglio2012-07-311-6/+3
| |\ \ \ \ \ \
| | * | | | | | Improve Toast RTL supportFabrice Di Meglio2012-07-301-6/+3
| * | | | | | | Merge "API to adjust network stats. DO NOT MERGE." into jb-mr1-devJeff Sharkey2012-07-312-0/+31
| |\ \ \ \ \ \ \
| | * | | | | | | API to adjust network stats. DO NOT MERGE.Jeff Sharkey2012-07-312-0/+31
* | | | | | | | | am 6cbfa689: am 4b941f00: Merge "Fix bug 6906134" into jb-mr1-devAdam Powell2012-07-311-12/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix bug 6906134Adam Powell2012-07-311-12/+14
* | | | | | | | | am a8e77099: am e23ae144: am fa74f7e0: am bba948dc: Merge "Delay AccountManag...Kenny Root2012-07-314-4/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am fa74f7e0: am bba948dc: Merge "Delay AccountManagerService initialization" ...Kenny Root2012-07-314-4/+15
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | am bba948dc: Merge "Delay AccountManagerService initialization" into jb-devKenny Root2012-07-314-4/+15
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Merge "Delay AccountManagerService initialization" into jb-devKenny Root2012-07-314-4/+15
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Delay AccountManagerService initializationKenny Root2012-07-304-4/+15
| | * | | | | | | am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for locat...Nick Pelly2012-07-311-3/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | DO NOT MERGE. Add package-name-prefix blacklist for location updates.Nick Pelly2012-07-301-3/+3
| | | |/ / / / /
* | | | | | | | Revert "am a21a6075: Reconcile with jb-mr1-release"The Android Open Source Project2012-07-314-2/+33
* | | | | | | | am d8d0e2f2: Sync with jb-mr1-devThe Android Open Source Project2012-07-312-2/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge " Tentertively enable notification ime switcher" into jb-mr1-devSatoshi Kataoka2012-07-301-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Tentertively enable notification ime switcherSatoshi Kataoka2012-07-311-1/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge "New API level 17 for JB MR1." into jb-mr1-devDianne Hackborn2012-07-301-1/+6
| |\ \ \ \ \ \
| | * | | | | | New API level 17 for JB MR1.Dianne Hackborn2012-07-301-1/+6
| * | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devYing Wang2012-07-302-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Import translations. DO NOT MERGEYing Wang2012-07-302-2/+2
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge "Deprecate WebSettings.LOAD_NORMAL cache mode."Mikhail Naganov2012-07-311-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Deprecate WebSettings.LOAD_NORMAL cache mode.Mikhail Naganov2012-07-301-1/+5
* | | | | | | | | am a21a6075: Reconcile with jb-mr1-releaseThe Android Open Source Project2012-07-304-33/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | am 85c1765e: am 3330ae59: Merge "Improve Toast RTL support" into jb-mr1-devFabrice Di Meglio2012-07-301-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Improve Toast RTL support" into jb-mr1-devFabrice Di Meglio2012-07-301-2/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Improve Toast RTL supportFabrice Di Meglio2012-07-301-2/+2
* | | | | | | | | am 2ebfee16: am 859a62ce: Merge "Enforce a maximum size for action button ico...Adam Powell2012-07-301-2/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Enforce a maximum size for action button icons." into jb-mr1-devAdam Powell2012-07-301-2/+21
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Enforce a maximum size for action button icons.Adam Powell2012-07-301-2/+21
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge "Import translations. DO NOT MERGE"Ying Wang2012-07-301-1/+1
|\ \ \ \ \ \ \ \