summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp...Robert Greenwalt2013-10-151-21/+34
|\
| * Merge "Retry captiveportal check even if only one addr" into klp-devRobert Greenwalt2013-10-161-21/+34
| |\
| | * Retry captiveportal check even if only one addrRobert Greenwalt2013-10-151-21/+34
* | | am 4270ebc7: Merge "Remove debug logging." into klp-devCraig Mautner2013-10-154-10/+10
|\ \ \ | |/ /
| * | Merge "Remove debug logging." into klp-devCraig Mautner2013-10-164-10/+10
| |\ \
| | * | Remove debug logging.Craig Mautner2013-10-154-10/+10
* | | | am 41bf03e1: Merge "Restore window manager stack order on user switch." into ...Craig Mautner2013-10-152-11/+19
|\ \ \ \ | |/ / /
| * | | Merge "Restore window manager stack order on user switch." into klp-devCraig Mautner2013-10-162-11/+19
| |\ \ \
| | * | | Restore window manager stack order on user switch.Craig Mautner2013-10-152-11/+19
| | |/ /
* | | | am 577d0dac: Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-devIgor Murashkin2013-10-15148-0/+20302
|\ \ \ \ | |/ / /
| * | | Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-devIgor Murashkin2013-10-16148-0/+20302
| |\ \ \
| | * | | SmartCamera: Fix to build against latest camera2 apiIgor Murashkin2013-10-153-7/+9
| | * | | Camera2Tests: update SmartCamera for async apiIgor Murashkin2013-10-152-10/+20
| | * | | Camera2Tests: Add SmartCamera AppBenjamin Hendricks2013-10-15148-0/+20290
* | | | | am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-devJeff Sharkey2013-10-152-51/+94
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Improve OPEN/CREATE_DOC docs." into klp-devJeff Sharkey2013-10-152-51/+94
| |\ \ \ \
| | * | | | Improve OPEN/CREATE_DOC docs.Jeff Sharkey2013-10-152-51/+94
* | | | | | am 3cf56085: Merge "Improve external storage docs on Context." into klp-devJeff Sharkey2013-10-151-44/+104
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Improve external storage docs on Context." into klp-devJeff Sharkey2013-10-151-44/+104
| |\ \ \ \ \ | | |/ / / /
| | * | | | Improve external storage docs on Context.Jeff Sharkey2013-10-151-44/+104
* | | | | | am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" int...Michael Wright2013-10-152-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Force the wallpaper to reload when dimensions change" into klp-devMichael Wright2013-10-152-0/+2
| |\ \ \ \ \
| | * | | | | Force the wallpaper to reload when dimensions changeMichael Wright2013-10-152-0/+2
* | | | | | | am e1b6b6c5: Bring deleted files from the dead. These files were dropped by t...Baligh Uddin2013-10-154-0/+145
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Bring deleted files from the dead.Baligh Uddin2013-10-154-0/+145
* | | | | | | am 2cc95775: Merge "Fix possible crash in System UI" into klp-devJim Miller2013-10-151-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix possible crash in System UI" into klp-devJim Miller2013-10-151-0/+3
| |\ \ \ \ \ \
| | * | | | | | Fix possible crash in System UIJim Miller2013-10-151-0/+3
| | |/ / / / /
* | | | | | | am 1fcf34d8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-10-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-1557-60/+62
| | |_|/ / / | |/| | | |
* | | | | | am f847c3b0: Merge "Update resource name for renamed string." into klp-devJohn Spurlock2013-10-1571-84/+70
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Update resource name for renamed string." into klp-devJohn Spurlock2013-10-1571-84/+70
| |\ \ \ \ \
| | * | | | | Update resource name for renamed string.John Spurlock2013-10-1571-84/+70
| | | |_|/ / | | |/| | |
* | | | | | am 709827cd: Merge "Updated rssi assets for quick settings" into klp-devDaniel Sandler2013-10-1548-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Updated rssi assets for quick settings" into klp-devDaniel Sandler2013-10-1548-0/+0
| |\ \ \ \ \
| | * | | | | Updated rssi assets for quick settingsDaniel Sandler2013-10-1548-0/+0
| | |/ / / /
* | | | | | am 5a736fcd: Merge "Adding a missing resource file." into klp-devSvetoslav Ganov2013-10-151-0/+33
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Adding a missing resource file." into klp-devSvetoslav Ganov2013-10-151-0/+33
| |\ \ \ \ \
| | * | | | | Adding a missing resource file.Svetoslav Ganov2013-10-151-0/+33
* | | | | | | am 58216c26: Camera2: return CaptureResult.STATISTICS_FACESZhijun He2013-10-151-37/+35
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Camera2: return CaptureResult.STATISTICS_FACESZhijun He2013-10-151-37/+35
| | |/ / / / | |/| | | |
* | | | | | am 4a534e00: Merge "Delete BrowserTestPlugin." into klp-devTorne (Richard Coles)2013-10-1513-1162/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Delete BrowserTestPlugin." into klp-devTorne (Richard Coles)2013-10-1513-1162/+0
| |\ \ \ \ \
| | * | | | | Delete BrowserTestPlugin.Torne (Richard Coles)2013-10-1513-1162/+0
* | | | | | | am c09e5911: Merge "Fix error when PAC set rapidly" into klp-devJason Monk2013-10-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix error when PAC set rapidly" into klp-devJason Monk2013-10-151-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix error when PAC set rapidlyJason Monk2013-10-141-1/+1
* | | | | | | am 94c0057d: Delete the old WebView.Torne (Richard Coles)2013-10-1555-29789/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Delete the old WebView.Torne (Richard Coles)2013-10-1555-29789/+0
* | | | | | | am d892afc8: Remove support for switching WebView.Torne (Richard Coles)2013-10-151-28/+3
|\ \ \ \ \ \ \ | |/ / / / / /