summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one a...Robert Greenwalt2013-10-151-21/+34
|\
| * 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 504b6045: am 4270ebc7: Merge "Remove debug logging." into klp-devCraig Mautner2013-10-154-10/+10
|\ \ \ \ | |/ / /
| * | | 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 d68cd8cc: am 41bf03e1: Merge "Restore window manager stack order on user s...Craig Mautner2013-10-152-11/+19
|\ \ \ \ \ | |/ / / /
| * | | | 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 a451b603: am 577d0dac: Merge changes I536021b9,I6eb541c9,I6ac08eca into kl...Igor Murashkin2013-10-15148-0/+20302
|\ \ \ \ \ | |/ / / /
| * | | | 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 f82a387c: am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-devJeff Sharkey2013-10-152-51/+94
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 84c8603d: am 3cf56085: Merge "Improve external storage docs on Context." i...Jeff Sharkey2013-10-151-44/+104
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 19fa2122: am 6bd7603a: Merge "Force the wallpaper to reload when dimension...Michael Wright2013-10-152-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 ffe8b79f: (-s ours) am e1b6b6c5: Bring deleted files from the dead. These ...Baligh Uddin2013-10-150-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
* | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-dev-plus-aospBaligh Uddin2013-10-1557-3959/+23858
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-1557-3959/+23858
* | | | | | | | | am d5bda747: am 2cc95775: Merge "Fix possible crash in System UI" into klp-devJim Miller2013-10-151-0/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | 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 d99b9fd3: (-s ours) am 1fcf34d8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-10-150-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 1fcf34d8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-10-150-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-1557-60/+62
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | resolved conflicts for merge of e8962d4b to klp-dev-plus-aospJohn Spurlock2013-10-151-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | 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 de70a7c3: am 709827cd: Merge "Updated rssi assets for quick settings" into...Daniel Sandler2013-10-1548-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| | | |/ / / /