summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Access mock location is no longer a runtime permission - frameworkSvet Ganov2015-05-1310-101/+118
* Merge "Add keystore onUserAdded/Removed methods" into mnc-devChad Brubaker2015-05-133-12/+44
|\
| * Add keystore onUserAdded/Removed methodsChad Brubaker2015-05-133-12/+44
* | Merge "induct a bunch of new logging categories." into mnc-devChris Wren2015-05-132-83/+88
|\ \
| * | induct a bunch of new logging categories.Chris Wren2015-05-132-83/+88
* | | Merge "Strip PNG metadata" into mnc-devAlan Viverette2015-05-135690-0/+0
|\ \ \ | |_|/ |/| |
| * | Strip PNG metadataAlan Viverette2015-05-125690-0/+0
* | | Merge "Switching to PersistableBundle in carrier config API." into mnc-devJonathan Basseri2015-05-136-28/+28
|\ \ \
| * | | Switching to PersistableBundle in carrier config API.Jonathan Basseri2015-05-136-28/+28
* | | | Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-devNicolas Prevot2015-05-131-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED.Nicolas Prevot2015-05-121-1/+1
* | | | Merge "Fix issue where handle is in front of word rather than end of word" in...Mady Mellor2015-05-132-80/+93
|\ \ \ \
| * | | | Fix issue where handle is in front of word rather than end of wordMady Mellor2015-05-122-80/+93
* | | | | Merge "Icon API tuneups:" into mnc-devDan Sandler2015-05-134-29/+70
|\ \ \ \ \
| * | | | | Icon API tuneups:Dan Sandler2015-05-134-29/+70
* | | | | | am 37d0c94f: (-s ours) am 0cbd0cbd: Merge "Reduce display device log spam." i...Joe LaPenna2015-05-130-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ am 0cbd0cbd: Merge "Reduce display device log spam." into lmp-mr1-modular-devJoe LaPenna2015-05-133-29/+65
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Reduce display device log spam." into lmp-mr1-modular-devJoe LaPenna2015-05-133-29/+65
| | |\ \ \ \ \ \
| | | * | | | | | Reduce display device log spam.Jeff Brown2015-05-063-29/+65
* | | | | | | | | Merge "resolved conflicts for merge of f0c4f0dd to mnc-dev" into mnc-devWei Liu2015-05-133-13/+21
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ resolved conflicts for merge of f0c4f0dd to mnc-devWei Liu2015-05-133-13/+21
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 3d76e2f3: Merge "Create GpsLocationProvider only if GPS is supported." int...Wei Liu2015-05-123-13/+21
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "Create GpsLocationProvider only if GPS is supported." into lmp-mr1-mod...Wei Liu2015-05-123-13/+21
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Create GpsLocationProvider only if GPS is supported.Wei Liu2015-05-113-13/+21
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-1373-938/+731
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-05-1373-938/+731
* | | | | | | | | | | Merge "Unify DrawProfiler/JankStats" into mnc-devJohn Reck2015-05-138-126/+90
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Unify DrawProfiler/JankStatsJohn Reck2015-05-128-126/+90
* | | | | | | | | | | | Merge "API Council Change Phase 2 - add/remove callback" into mnc-devPaul McLean2015-05-134-57/+129
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | API Council Change Phase 2 - add/remove callbackPaul McLean2015-05-134-57/+129
* | | | | | | | | | | | | Merge "Ensure activity visiblity when moving task" into mnc-devStefan Kuhne2015-05-131-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Ensure activity visiblity when moving taskStefan Kuhne2015-05-131-0/+3
* | | | | | | | | | | | | | Merge "Zen: Map external ringer mode = silent to zen = alarms." into mnc-devJohn Spurlock2015-05-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Zen: Map external ringer mode = silent to zen = alarms.John Spurlock2015-05-131-2/+2
* | | | | | | | | | | | | | | Merge "Fix Floating Toolbar appearing after ActionMode was cancelled" into mn...Clara Bayarri2015-05-132-12/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix Floating Toolbar appearing after ActionMode was cancelledClara Bayarri2015-05-132-12/+19
* | | | | | | | | | | | | | | | Merge "Show IME switcher also when hardware keyboard is connected." into mnc-devYohei Yukawa2015-05-131-44/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Show IME switcher also when hardware keyboard is connected.Yohei Yukawa2015-05-121-44/+49
* | | | | | | | | | | | | | | | | Merge "Update API." into mnc-devTobias Sargeant2015-05-132-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Update API.Tobias Sargeant2015-05-132-2/+2
* | | | | | | | | | | | | | | | | | Merge "Fix crash from WPS" into mnc-devJason Monk2015-05-133-18/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix crash from WPSJason Monk2015-05-133-18/+63
* | | | | | | | | | | | | | | | | | | Merge "NoMan: Specify all users for noman broadcasts." into mnc-devJohn Spurlock2015-05-131-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | / / / / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | NoMan: Specify all users for noman broadcasts.John Spurlock2015-05-131-7/+6
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-1373-903/+601
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-05-1373-903/+601
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Removed unused Face Unlock aidl files" into mnc-devBrian Colonna2015-05-133-57/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Removed unused Face Unlock aidl filesBrian Colonna2015-05-083-57/+0
* | | | | | | | | | | | | | | | | Merge "Initial IpReachabilityMonitor implementation." into mnc-devErik Kline2015-05-131-0/+354
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Initial IpReachabilityMonitor implementation.Erik Kline2015-05-131-0/+354