summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am d43a71da: Merge "Help for the debugging help for issue #8734824." into jb-...Dianne Hackborn2013-05-065-3/+100
|\
| * Merge "Help for the debugging help for issue #8734824." into jb-mr2-devDianne Hackborn2013-05-065-3/+100
| |\
| | * Help for the debugging help for issue #8734824.Dianne Hackborn2013-05-065-3/+100
* | | am 06548798: am 2ad68f7d: am 04d61410: am dfb33b86: am fcfc99c0: am f7918b4a:...Christopher Tate2013-05-060-0/+0
|\ \ \ | |/ /
| * | am 2ad68f7d: am 04d61410: am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029:...Christopher Tate2013-05-060-0/+0
| |\ \
| | * \ am 04d61410: am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95:...Christopher Tate2013-05-061-1/+10
| | |\ \
| | | * \ am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3:...Christopher Tate2013-05-061-1/+10
| | | |\ \
| | | | * \ am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure insta...Christopher Tate2013-05-061-1/+10
| | | | |\ \
| | | | | * \ am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-res...Christopher Tate2013-05-061-1/+10
| | | | | |\ \
| | | | | | * \ am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like ...Christopher Tate2013-05-061-1/+10
| | | | | | |\ \
| | | | | | | * \ am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-...Christopher Tate2013-05-061-1/+10
| | | | | | | |\ \
| | | | | | | | * \ am 81c1d8d3: Ensure install-during-restore is like install-then-restoreChristopher Tate2013-05-061-1/+10
| | | | | | | | |\ \
| | | | | | | | | * | Ensure install-during-restore is like install-then-restoreChristopher Tate2013-05-061-1/+10
* | | | | | | | | | | am cd1de394: Merge "Track change in NativeCrypto"Kenny Root2013-05-061-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge "Track change in NativeCrypto"Kenny Root2013-05-061-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Track change in NativeCryptoKenny Root2013-05-061-0/+2
* | | | | | | | | | | | | am e242c731: Merge "Ensure install-during-restore is like install-then-restor...Christopher Tate2013-05-061-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge "Ensure install-during-restore is like install-then-restore" into jb-mr...Christopher Tate2013-05-061-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Ensure install-during-restore is like install-then-restoreChristopher Tate2013-05-061-1/+10
* | | | | | | | | | | | | am 601afaef: Merge "Someone\'s IDE chose the wrong Date."Elliott Hughes2013-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge "Someone's IDE chose the wrong Date."Elliott Hughes2013-05-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Someone's IDE chose the wrong Date.Elliott Hughes2013-05-061-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | am 5b88a2fd: Debugging help for issue #8734824: WATCHDOG KILLING SYSTEM PROCESSDianne Hackborn2013-05-065-2/+85
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Debugging help for issue #8734824: WATCHDOG KILLING SYSTEM PROCESSDianne Hackborn2013-05-065-2/+85
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | am 996f6b04: Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-05-063-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-05-063-5/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-063-5/+5
* | | | | | | | | | | | am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-devRobert Greenwalt2013-05-061-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Fix sync problem in NsdManager" into jb-mr2-devRobert Greenwalt2013-05-061-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix sync problem in NsdManagerRobert Greenwalt2013-05-021-2/+1
* | | | | | | | | | | | am 72f2a7af: Merge "Fix bug where thumbnails in Recents disappear" into jb-mr...Michael Jurka2013-05-062-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Fix bug where thumbnails in Recents disappear" into jb-mr2-devMichael Jurka2013-05-062-0/+7
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix bug where thumbnails in Recents disappearMichael Jurka2013-05-022-0/+7
* | | | | | | | | | | | | am 236cc476: Temporarily revert field name change (DO NOT MERGE)Dave Burke2013-05-063-23/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Temporarily revert field name change (DO NOT MERGE)Dave Burke2013-05-063-23/+23
* | | | | | | | | | | | | am 96f69cbe: am 20860a3f: am 79ebe80a: am e34ecc9a: am 3dbb173e: am c3a7ea42:...Dirk Dougherty2013-05-065-9/+171
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 20860a3f: am 79ebe80a: am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: ...Dirk Dougherty2013-05-045-9/+171
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 79ebe80a: am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: Update landin...Dirk Dougherty2013-05-045-9/+171
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for G...Dirk Dougherty2013-05-045-9/+171
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for Google Play Se...Dirk Dougherty2013-05-045-9/+171
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / | | | | | |/| | | | | | |
| | | | | * | | | | | | | am c3a7ea42: Doc change: Update landing pages for Google Play Services.Dirk Dougherty2013-05-045-9/+171
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | |_|_|/ / / / | | | | | | |/| | | | | |
| | | | | | * | | | | | | Doc change: Update landing pages for Google Play Services.Dirk Dougherty2013-05-035-9/+171
* | | | | | | | | | | | | am 02b7128f: Merge "Add android.opengl.EGLExt class for EGL extensions" into ...Jesse Hall2013-05-065-26/+217
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Add android.opengl.EGLExt class for EGL extensions" into jb-mr2-devJesse Hall2013-05-045-26/+217
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add android.opengl.EGLExt class for EGL extensionsJesse Hall2013-05-015-26/+217
* | | | | | | | | | | | | | am fdf13c90: Merge "Convert alpha from [0..1] to [0.255] range Bug #8808886" ...Romain Guy2013-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Convert alpha from [0..1] to [0.255] range Bug #8808886" into jb-mr2-devRomain Guy2013-05-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Convert alpha from [0..1] to [0.255] rangeRomain Guy2013-05-031-1/+1
* | | | | | | | | | | | | | | am d65eebf4: Merge "Fix scaled-view droppings artifact" into jb-mr2-devChet Haase2013-05-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Fix scaled-view droppings artifact" into jb-mr2-devChet Haase2013-05-041-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \