summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | am 3f10b42f: (-s ours) am 684332f2: (-s ours) am 5449f0fd: (-s ours) am 62f7a...Geoff Mendal2015-07-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 684332f2: (-s ours) am 5449f0fd: (-s ours) am 62f7a266: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 45e0aa09: (-s ours) am 13688c8b: (-s ours) am a95faf78: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 13688c8b: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am d8296c0e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6bee46a1: (-s ours) am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4...Geoff Mendal2015-07-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5...Geoff Mendal2015-07-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 04312d09: (-s ours) am 15579b8d: (-s ours) am 4e3575eb: (-s ours) am 4c77d...Geoff Mendal2015-07-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am 15579b8d: (-s ours) am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import t...Geoff Mendal2015-07-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 33fc1716: am 801d5289: am cc4f1804: am 6bb610be: am ad510fdd: Merge "Set M...Alan Newberger2015-07-141-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | am 801d5289: am cc4f1804: am 6bb610be: am ad510fdd: Merge "Set ModeListView t...Alan Newberger2015-07-131-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f962ec00: (-s ours) am c3b7039c: (-s ours) am f3eb023d: (-s ours) am 50f89...Geoff Mendal2015-07-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | am c3b7039c: (-s ours) am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1a...Geoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 521c3909: (-s ours) am 4732765a: (-s ours) am eb29ae19: (-s ours) am 45289...Geoff Mendal2015-07-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | am 4732765a: (-s ours) am eb29ae19: (-s ours) am 45289c3d: (-s ours) Import t...Geoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3cabdc8d: (-s ours) am 05bbbfc5: (-s ours) am 0e58fb83: (-s ours) Import t...Geoff Mendal2015-07-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | am 05bbbfc5: (-s ours) am 0e58fb83: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 35a0e880: (-s ours) am e552d003: (-s ours) am 57b4d24e: (-s ours) am 09364...Geoff Mendal2015-07-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | am e552d003: (-s ours) am 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a...Geoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3fa50c35: (-s ours) am a06a903f: (-s ours) am 5d806912: (-s ours) am e27c0...Geoff Mendal2015-07-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | am a06a903f: (-s ours) am 5d806912: (-s ours) am e27c079d: (-s ours) Import t...Geoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ea4dc6fc: (-s ours) am 718859d8: (-s ours) am 0462d5b1: (-s ours) Import t...Geoff Mendal2015-07-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 718859d8: (-s ours) am 0462d5b1: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4bbdfc81: am ca758103: am c9b45d41: am 01c3f7ad: am e25f675a: Shorten loca...Alan Newberger2015-07-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am ca758103: am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup ...Alan Newberger2015-07-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am aecc99f4: (-s ours) am 1fee657d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 1fee657d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b92d395a: am 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check w...Alan Newberger2015-07-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check when evaluatin...Alan Newberger2015-07-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b7142d73: am c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsActivit...zafir2015-07-092-10/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraAc...zafir2015-07-092-10/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c5a1f6cf: am b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check a...Alan Newberger2015-07-081-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successf...Alan Newberger2015-07-081-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e2a6302c: am b462c3ca: am f2bdf276: am c2d5d078: Restrict permission check...Alan Newberger2015-07-082-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b462c3ca: am f2bdf276: am c2d5d078: Restrict permission checks to M devicesAlan Newberger2015-07-082-0/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 342ebca3: (-s ours) am 3f3dfcb1: (-s ours) am ccb925b1: (-s ours) am a5380...Geoff Mendal2015-07-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3f3dfcb1: (-s ours) am ccb925b1: (-s ours) am a5380779: (-s ours) Import t...Geoff Mendal2015-07-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0a8c14f8: (-s ours) am 03d7cde4: (-s ours) am a532005c: (-s ours) Import t...Geoff Mendal2015-07-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 03d7cde4: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2b4101fe: am ad44cda8: Minimum viable Android M runtime permissions handli...zafir2015-07-075-52/+296
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1cef126a: am fd6f316a: Merge "Ensure CaptureModule/API2 works without fron...Alan Newberger2015-06-293-6/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 245239ba: am 62240e14: Merge "Update filmstrip item on metadata update" in...Alan Newberger2015-06-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 75dcaf3b: am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ...Senpo Hu2015-06-273-4/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d3611d6a: AOSP Camera source should run camera2 API on MAlan Newberger2015-06-191-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e07a7e90: (-s ours) am 2399038f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 71d368a9: am 8d8b329d: Fix for invalidated resolutions via upgradeI-Jong Lin2015-06-112-12/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5b76be0d: am e2323c53: Refresh required for full-screen undo in filmstripI-Jong Lin2015-06-081-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f7fa07b1: (-s ours) am 43c0ecae: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1c94fe67: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \