summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Refactor ProcessStats, ProcessTracker."Dianne Hackborn2013-08-0613-3278/+3320
|\
| * Refactor ProcessStats, ProcessTracker.Dianne Hackborn2013-08-0613-3278/+3320
* | Clearly separate consumer and producer interfacesMathias Agopian2013-08-0611-58/+83
* | Merge "Read intent firewall rules from any xml file in the ifw directory"Ben Gruver2013-08-062-80/+75
|\ \
| * | Read intent firewall rules from any xml file in the ifw directoryBen Gruver2013-07-312-80/+75
* | | Merge "Extend clearing of mLastPausedActivity."Craig Mautner2013-08-062-11/+27
|\ \ \
| * | | Extend clearing of mLastPausedActivity.Craig Mautner2013-08-062-11/+27
* | | | Merge "Minor style cleanups."Jeff Brown2013-08-061-40/+49
|\ \ \ \
| * | | | Minor style cleanups.Jeff Brown2013-08-051-40/+49
* | | | | Merge "Storage roots in fragment, sectioned."Jeff Sharkey2013-08-0615-224/+734
|\ \ \ \ \
| * | | | | Storage roots in fragment, sectioned.Jeff Sharkey2013-08-0615-224/+734
* | | | | | Merge "Reorder and comment MediaFocusControl code"Jean-Michel Trivi2013-08-061-29/+33
|\ \ \ \ \ \
| * | | | | | Reorder and comment MediaFocusControl codeJean-Michel Trivi2013-08-061-29/+33
* | | | | | | Merge "Remove restrictions PIN for all users"Amith Yamasani2013-08-061-3/+20
|\ \ \ \ \ \ \
| * | | | | | | Remove restrictions PIN for all usersAmith Yamasani2013-08-061-3/+20
* | | | | | | | Merge "Avoid creating new objects when DateView updates time"Alan Viverette2013-08-061-5/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid creating new objects when DateView updates timeAlan Viverette2013-07-291-5/+17
* | | | | | | | | am c5663c9f: am 8154d293: am 58c68d77: Merge "Doc change: Updated reference d...Dirk Dougherty2013-08-06167-5047/+12358
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 8154d293: am 58c68d77: Merge "Doc change: Updated reference docs for Googl...Dirk Dougherty2013-08-06167-5047/+12358
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 58c68d77: Merge "Doc change: Updated reference docs for Google Play Servic...Dirk Dougherty2013-08-06167-5047/+12358
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge "Doc change: Updated reference docs for Google Play Services 3.2." into...Dirk Dougherty2013-08-06167-5047/+12358
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Doc change: Updated reference docs for Google Play Services 3.2.Dirk Dougherty2013-08-01167-5047/+12358
* | | | | | | | | | | | | Merge "Revert "Fix broken unit test""David Christie2013-08-061-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "Fix broken unit test"David Christie2013-08-061-2/+1
* | | | | | | | | | | | | | Merge "Fix broken unit test"David Christie2013-08-061-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Fix broken unit testDavid Christie2013-08-021-1/+2
* | | | | | | | | | | | | | ImageReader: Add RGB format support.Zhijun He2013-08-062-2/+62
* | | | | | | | | | | | | | Merge "Add DEMOTED and UNDEMOTE TO ContactsContract"Yorke Lee2013-08-061-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add DEMOTED and UNDEMOTE TO ContactsContractYorke Lee2013-08-051-0/+31
* | | | | | | | | | | | | | | Merge "More recents work; filtering and sorting."Jeff Sharkey2013-08-0610-337/+855
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | More recents work; filtering and sorting.Jeff Sharkey2013-08-0510-337/+855
* | | | | | | | | | | | | | | Merge "Whoops, not yet time to be an error."Dianne Hackborn2013-08-061-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Whoops, not yet time to be an error.Dianne Hackborn2013-08-051-3/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Remove an unused C zip API."Elliott Hughes2013-08-063-116/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove an unused C zip API.Elliott Hughes2013-08-053-116/+0
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | am 9fe49fc5: am 523db46f: Merge "Set subscription_mode in the database to a d...Wink Saville2013-08-052-10/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | / / / / / / / / / | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 523db46f: Merge "Set subscription_mode in the database to a default value"Wink Saville2013-08-052-10/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Set subscription_mode in the database to a default value"Wink Saville2013-08-062-10/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Set subscription_mode in the database to a default valueNaveen Kalla2013-08-012-10/+8
* | | | | | | | | | | | | | | | Merge "Start restricting service calls with implicit intents."Dianne Hackborn2013-08-0611-62/+170
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Start restricting service calls with implicit intents.Dianne Hackborn2013-08-0511-62/+170
* | | | | | | | | | | | | | | | | Merge "Add a new process state for "service restarting"."Dianne Hackborn2013-08-063-92/+284
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Add a new process state for "service restarting".Dianne Hackborn2013-08-053-92/+284
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Clear last paused activity."Craig Mautner2013-08-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Clear last paused activity.Craig Mautner2013-08-051-0/+1
* | | | | | | | | | | | | | | | | am 3a5e2013: am ebbcc18e: am 4032217e: Merge "Add option for video playback t...Xia Wang2013-08-052-14/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am ebbcc18e: am 4032217e: Merge "Add option for video playback test to accept...Xia Wang2013-08-052-14/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 4032217e: Merge "Add option for video playback test to accept media source...Xia Wang2013-08-052-14/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add option for video playback test to accept media source path." into ...Xia Wang2013-08-052-14/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Add option for video playback test to accept media source path.Xia Wang2013-07-112-14/+23