summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | am 2606fc48: Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-300-0/+0
|\ \
| | \
| | \
| *-. \ Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-300-0/+0
| |\ \ \
| | | * | Fix NPE on some phones at startup.Daniel Sandler2012-07-261-2/+3
| | | * | Fix 6804479: "Emergency calls only" in notification shadeDaniel Sandler2012-07-251-2/+4
| | | * | Implement CMAS service category program results.Jake Hamby2012-07-247-29/+287
| | | * | Fix detection of CDMA cell broadcast messages.Jake Hamby2012-07-241-1/+7
| | | * | Fix our interpretation of apn setting's bearer.Robert Greenwalt2012-07-241-3/+3
| | | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | | |\ \
| | | | * | Implement CMAS service category program results.Jake Hamby2012-07-247-29/+287
| | | | * | Fix detection of CDMA cell broadcast messages.Jake Hamby2012-07-241-1/+7
| | | | * | Fix our interpretation of apn setting's bearer.Robert Greenwalt2012-07-241-3/+3
| | | |/ /
| | * | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-260-0/+0
| | |\ \ \
| | | * \ \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | | |\ \ \
* | | | \ \ \ am a3b69d1f: am 81a9bece: Merge "copy and image updates to patterns and build...Peter Ng2012-07-3016-47/+60
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 81a9bece: Merge "copy and image updates to patterns and building blocks" i...Peter Ng2012-07-3016-47/+60
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "copy and image updates to patterns and building blocks" into jb-devPeter Ng2012-07-3016-47/+60
| | |\ \ \ \ \ \
| | | * | | | | | copy and image updates to patterns and building blocksPeter Ng2012-07-1916-47/+60
* | | | | | | | | 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
* | | | | | | | | | 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 "Enabled application using VideoView to get information events from Med...James Dong2012-07-302-0/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enabled application using VideoView to get information events from MediaPlayerJames Dong2012-07-272-0/+14
* | | | | | | | | | | am fc92eb94: am 2ffb1acb: Merge " Fix preload classname for phone policy."Adam Powell2012-07-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 2ffb1acb: Merge " Fix preload classname for phone policy."Adam Powell2012-07-301-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge " Fix preload classname for phone policy."Adam Powell2012-07-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix preload classname for phone policy.SangWook Han2012-06-071-1/+1
* | | | | | | | | | | | | Merge "Improve ListPopupWindow RTL support" into jb-mr1-devFabrice Di Meglio2012-07-301-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Improve ListPopupWindow RTL supportFabrice Di Meglio2012-07-301-2/+21
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Move and rename user activity event type constants." into jb-mr1-devJeff Brown2012-07-279-30/+44
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move and rename user activity event type constants.Jeff Brown2012-07-279-30/+44
* | | | | | | | | | | | | Merge "Flatten power manager wake lock constants." into jb-mr1-devJeff Brown2012-07-272-52/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Flatten power manager wake lock constants.Jeff Brown2012-07-272-52/+74
* | | | | | | | | | | | | Merge "Implement equals() and hashCode() like a good little object." into jb-...Jeff Brown2012-07-271-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Implement equals() and hashCode() like a good little object.Jeff Brown2012-07-271-0/+14
* | | | | | | | | | | | | Merge "Fix inconsistency in user activity types." into jb-mr1-devJeff Brown2012-07-272-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Fix inconsistency in user activity types.Jeff Brown2012-07-272-7/+12
* | | | | | | | | | | | | am 86371474: am 47db02ba: Merge "No longer parceling FixedSizeRemoteViewsCach...Adam Cohen2012-07-271-129/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 47db02ba: Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-devAdam Cohen2012-07-271-129/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-devAdam Cohen2012-07-271-129/+34
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | No longer parceling FixedSizeRemoteViewsCachesAdam Cohen2012-07-271-129/+34
* | | | | | | | | | | | | | am 9ddc6ed3: am 36e055bd: Doc change: fix typo.Dirk Dougherty2012-07-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | / / / / / / | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | am 36e055bd: Doc change: fix typo.Dirk Dougherty2012-07-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Doc change: fix typo.Dirk Dougherty2012-07-271-1/+1
* | | | | | | | | | | | | Merge "Rename drawGeneralText to drawText" into jb-mr1-devRomain Guy2012-07-275-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Rename drawGeneralText to drawTextRomain Guy2012-07-275-13/+13
* | | | | | | | | | | | | | Merge "Split NST handler events away from CS internals." into jb-mr1-devJeff Sharkey2012-07-272-52/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Split NST handler events away from CS internals.Jeff Sharkey2012-07-262-52/+49