OSDN Git Service
The Android Open Source Project [Fri, 22 Nov 2013 18:35:34 +0000 (10:35 -0800)]
Narayan Kamath [Thu, 31 Oct 2013 16:18:30 +0000 (16:18 +0000)]
Merge "Fix invalid private access."
Narayan Kamath [Wed, 23 Oct 2013 13:39:27 +0000 (14:39 +0100)]
Fix invalid private access.
See http://bugs.sun.com/view_bug.do?bug_id=
6904536
bug:
8992787
(cherry picked from
ff19ed981400cd150f8779107cba1e02033b9ebe)
Change-Id: I7cad5e9cf8761b440cf91b96e3599d19bc3188d9
Ed Heyl [Thu, 17 Oct 2013 01:02:06 +0000 (18:02 -0700)]
am
b8f36242: am
a88cf82c: merge in klp-release (no-op)
* commit '
b8f36242a11f6323e957bcd1b7c6b849c9573b59':
Rename Gallery activity and add trampoline
enable change in printing
Ed Heyl [Thu, 17 Oct 2013 00:52:17 +0000 (17:52 -0700)]
am
a88cf82c: merge in klp-release (no-op)
* commit '
a88cf82c6eb7f5767efbf7f254ce75f100f5f86a':
Rename Gallery activity and add trampoline
enable change in printing
Ed Heyl [Thu, 17 Oct 2013 00:45:36 +0000 (17:45 -0700)]
merge in klp-release (no-op)
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:18:48 +0000 (15:18 -0700)]
am
556a015d: am
19b2236c: am
c0247a59: updated camera launcher icon in Gallery2 package as well
* commit '
556a015d3e7ed9e821795ca13a5daf7ba34aafd5':
updated camera launcher icon in Gallery2 package as well
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:16:20 +0000 (15:16 -0700)]
am
19b2236c: am
c0247a59: updated camera launcher icon in Gallery2 package as well
* commit '
19b2236c1707e79fdb3b6d911b1142c6074c5950':
updated camera launcher icon in Gallery2 package as well
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:13:54 +0000 (15:13 -0700)]
am
c0247a59: updated camera launcher icon in Gallery2 package as well
* commit '
c0247a599ffa70eebda4f1c8c1ce5b132da648bd':
updated camera launcher icon in Gallery2 package as well
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 17:36:18 +0000 (10:36 -0700)]
updated camera launcher icon in Gallery2 package as well
fixes b/
11252316
Change-Id: I164492e9fd6544257d685279c35ba026f24ca79d
The Android Automerger [Wed, 16 Oct 2013 08:31:59 +0000 (01:31 -0700)]
merge in klp-release history after reset to klp-dev
Alan Newberger [Wed, 16 Oct 2013 05:37:01 +0000 (22:37 -0700)]
am
4460df7c: am
efa8ae01: am
1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad
* commit '
4460df7c2bd4007ae658cd1a4a367c0bddca5c1f':
Update Gallery2 camera launchers
nicolasroard [Wed, 16 Oct 2013 05:37:00 +0000 (22:37 -0700)]
am
c41bf6c0: am
48265373: am
1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad
* commit '
c41bf6c0fe7ce0dd2d085898c6de3fbebd543825':
Fix Gallery auto-hide action bar in Album view
nicolasroard [Wed, 16 Oct 2013 05:37:00 +0000 (22:37 -0700)]
am
62cd0cfc: am
50427582: am
2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad
* commit '
62cd0cfc336fd6a5bda46f544b556f493c3abae5':
Fix crash "Gallery has stopped" popup occurs during print setup
Alan Newberger [Wed, 16 Oct 2013 05:35:38 +0000 (22:35 -0700)]
am
efa8ae01: am
1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad
* commit '
efa8ae01ad897457f86c17477ea3d5a3330ba521':
Update Gallery2 camera launchers
nicolasroard [Wed, 16 Oct 2013 05:35:38 +0000 (22:35 -0700)]
am
48265373: am
1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad
* commit '
48265373efbc89e3e4fd07b913b118ca645a4d02':
Fix Gallery auto-hide action bar in Album view
nicolasroard [Wed, 16 Oct 2013 05:35:37 +0000 (22:35 -0700)]
am
50427582: am
2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad
* commit '
50427582dcb4ab4be04d7bfdaa236a78de99aa95':
Fix crash "Gallery has stopped" popup occurs during print setup
Alan Newberger [Wed, 16 Oct 2013 05:34:22 +0000 (22:34 -0700)]
am
1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad
* commit '
1582e5dfdbc19ea704ab0f9c77df8cd94eea3056':
Update Gallery2 camera launchers
nicolasroard [Wed, 16 Oct 2013 05:34:21 +0000 (22:34 -0700)]
am
1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad
* commit '
1b56a245a253244628ff0ddfdbe5f51cf8475b16':
Fix Gallery auto-hide action bar in Album view
nicolasroard [Wed, 16 Oct 2013 05:34:21 +0000 (22:34 -0700)]
am
2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad
* commit '
2037f39bd3b5caeb8161928df59acff5cd92dd38':
Fix crash "Gallery has stopped" popup occurs during print setup
Alan Newberger [Wed, 16 Oct 2013 05:31:58 +0000 (05:31 +0000)]
Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad
nicolasroard [Wed, 16 Oct 2013 05:31:28 +0000 (05:31 +0000)]
Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad
nicolasroard [Wed, 16 Oct 2013 05:31:15 +0000 (05:31 +0000)]
Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad
The Android Automerger [Wed, 16 Oct 2013 04:14:16 +0000 (21:14 -0700)]
merge in klp-release history after reset to klp-dev
Alan Newberger [Wed, 16 Oct 2013 03:54:29 +0000 (20:54 -0700)]
Update Gallery2 camera launchers
This updates the Camera launcher icons used in the trampoline activity
which preserves existing shortcuts from Camera icons on JB MR2 home screens.
Bug:
11242234
Change-Id: I1fa83f4353112130b2f35d8d6a6884f090e3da82
nicolasroard [Wed, 16 Oct 2013 02:46:05 +0000 (19:46 -0700)]
Fix crash "Gallery has stopped" popup occurs during print setup
bug:
11159662
Change-Id: I181fe6f581290067b9a39d1382bf6ede08484c0a
Mangesh Ghiware [Wed, 16 Oct 2013 02:34:13 +0000 (19:34 -0700)]
am
30655083: am
11bf46c0: am
a4f2389c: Catch all the exceptions.
* commit '
30655083dcf6843f69bf4a1ed453625ca9487248':
Catch all the exceptions.
Mangesh Ghiware [Wed, 16 Oct 2013 02:31:53 +0000 (19:31 -0700)]
am
11bf46c0: am
a4f2389c: Catch all the exceptions.
* commit '
11bf46c0cb7963ce103ce8d3f67eb743600e00e8':
Catch all the exceptions.
Mangesh Ghiware [Wed, 16 Oct 2013 02:28:41 +0000 (19:28 -0700)]
am
a4f2389c: Catch all the exceptions.
* commit '
a4f2389cf50404854d7820326d776deb7b6c1ad7':
Catch all the exceptions.
Mangesh Ghiware [Wed, 16 Oct 2013 00:53:42 +0000 (17:53 -0700)]
Catch all the exceptions.
Bug:
11156898
Change-Id: Ic16a858bb5d1f8838ffa201c910b617f859c9074
nicolasroard [Tue, 15 Oct 2013 22:36:16 +0000 (15:36 -0700)]
Fix Gallery auto-hide action bar in Album view
bug:
11218758
Change-Id: Id48e54842ea3539396801d99ea8ec33e58c7a1f1
The Android Automerger [Tue, 15 Oct 2013 13:01:11 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Tenghui Zhu [Tue, 15 Oct 2013 02:01:14 +0000 (19:01 -0700)]
am
1214470a: am
94678fc1: am
db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad
* commit '
1214470a617e31d65f8efe507143945a428be5b8':
Revert "Play the video on top of lock screen"
John Hoford [Tue, 15 Oct 2013 02:01:14 +0000 (19:01 -0700)]
am
74ea45fa: am
8cee8116: am
5169137f: fix Vignette collapse to a line
* commit '
74ea45fa511977cc579ef4b78ceb413a6312793a':
fix Vignette collapse to a line
Tenghui Zhu [Tue, 15 Oct 2013 00:19:57 +0000 (17:19 -0700)]
am
94678fc1: am
db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad
* commit '
94678fc1d2b5235cfeae360ca2567579e8fed848':
Revert "Play the video on top of lock screen"
John Hoford [Tue, 15 Oct 2013 00:19:23 +0000 (17:19 -0700)]
am
8cee8116: am
5169137f: fix Vignette collapse to a line
* commit '
8cee8116468f4cb6c486994c4bf83b4a0dffaddc':
fix Vignette collapse to a line
Tenghui Zhu [Mon, 14 Oct 2013 23:48:30 +0000 (16:48 -0700)]
am
db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad
* commit '
db30124ab6dabd8e24789efaa4e6db7622889b87':
Revert "Play the video on top of lock screen"
Tenghui Zhu [Mon, 14 Oct 2013 23:44:18 +0000 (23:44 +0000)]
Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad
John Hoford [Mon, 14 Oct 2013 22:23:46 +0000 (15:23 -0700)]
am
5169137f: fix Vignette collapse to a line
* commit '
5169137f59114a9549dd056ce4bf843b9b421c4a':
fix Vignette collapse to a line
John Hoford [Mon, 14 Oct 2013 22:09:45 +0000 (15:09 -0700)]
fix Vignette collapse to a line
bug:
11221755
Change-Id: Ibe04770d0cfd3fe596ef72e86ccfe461c0cf63b1
Tenghui Zhu [Mon, 14 Oct 2013 16:16:18 +0000 (16:16 +0000)]
Revert "Play the video on top of lock screen"
This reverts commit
417f074dbcf07843bf02e762c2fe3b23fe8af32b.
From the discussion in the bug, for Carlsbad, we will take
the JBMR2 approach for safety concern.
Change-Id: Ieae45e1ae7580c94c08277e580b123e6f504a3b4
bug:
11190995
The Android Automerger [Mon, 14 Oct 2013 13:00:37 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Mangesh Ghiware [Mon, 14 Oct 2013 01:51:44 +0000 (18:51 -0700)]
am
0bb52872: am
41f9cf0a: am
315ce716: One crop and set wallpaper activity is enough!
* commit '
0bb52872c8209833767e4e37fc322c02544641db':
One crop and set wallpaper activity is enough!
Mangesh Ghiware [Mon, 14 Oct 2013 01:48:51 +0000 (18:48 -0700)]
am
41f9cf0a: am
315ce716: One crop and set wallpaper activity is enough!
* commit '
41f9cf0a2998dbac5af6464d5f20a5c31cc594ff':
One crop and set wallpaper activity is enough!
Mangesh Ghiware [Mon, 14 Oct 2013 01:44:03 +0000 (18:44 -0700)]
am
315ce716: One crop and set wallpaper activity is enough!
* commit '
315ce7165e64aadb9d929677284957c4d7f8f0d8':
One crop and set wallpaper activity is enough!
Mangesh Ghiware [Mon, 14 Oct 2013 01:36:12 +0000 (18:36 -0700)]
One crop and set wallpaper activity is enough!
Bug:
11206305
Change-Id: Ibd2d4c52c98f02f58e251984696742b9a935b0b8
The Android Automerger [Sun, 13 Oct 2013 13:02:31 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
nicolasroard [Sat, 12 Oct 2013 02:10:23 +0000 (19:10 -0700)]
am
1c2bfe47: am
0fff5600: am
976b9a3a: Fix showing the wrong image after animation
* commit '
1c2bfe47bffc2d6d9cc3e6bcdece193f29deb32f':
Fix showing the wrong image after animation
nicolasroard [Sat, 12 Oct 2013 02:06:57 +0000 (19:06 -0700)]
am
0fff5600: am
976b9a3a: Fix showing the wrong image after animation
* commit '
0fff56009d3fd3df73761d6b82646bcf14fcc1cc':
Fix showing the wrong image after animation
nicolasroard [Sat, 12 Oct 2013 02:05:15 +0000 (19:05 -0700)]
am
976b9a3a: Fix showing the wrong image after animation
* commit '
976b9a3a98f48ed69bbe66070e2e2e3f3e6aae43':
Fix showing the wrong image after animation
nicolasroard [Sat, 12 Oct 2013 01:27:55 +0000 (18:27 -0700)]
Fix showing the wrong image after animation
bug:
10856175
Change-Id: I87d2bcd1bb1a4ee28536a97f018b6a3cf409d1b8
nicolasroard [Sat, 12 Oct 2013 00:45:59 +0000 (17:45 -0700)]
am
3bf57172: am
5063d3ab: am
eeed64b1: Process correctly an export when called with EDIT intent
* commit '
3bf571728146ef460f42dcd03c9648a67e073168':
Process correctly an export when called with EDIT intent
nicolasroard [Sat, 12 Oct 2013 00:43:14 +0000 (17:43 -0700)]
am
5063d3ab: am
eeed64b1: Process correctly an export when called with EDIT intent
* commit '
5063d3abf86f997b48493d05d9a0894d75b8ec11':
Process correctly an export when called with EDIT intent
nicolasroard [Sat, 12 Oct 2013 00:41:32 +0000 (17:41 -0700)]
am
eeed64b1: Process correctly an export when called with EDIT intent
* commit '
eeed64b1fbdafe5c91ce36b3c5488c003fbb8fab':
Process correctly an export when called with EDIT intent
nicolasroard [Fri, 11 Oct 2013 23:22:14 +0000 (16:22 -0700)]
Process correctly an export when called with EDIT intent
bug:
11159123
Change-Id: I8c827d9f757c4fd00d21753753917b62d5ba0213
John Hoford [Sat, 12 Oct 2013 00:09:39 +0000 (17:09 -0700)]
am
4283930e: am
72dfc381: am
dfe30aa6: Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad
* commit '
4283930e8531894f7749fc7c0fd54897a9a77461':
fix showing wrong image post save
John Hoford [Sat, 12 Oct 2013 00:07:38 +0000 (17:07 -0700)]
am
72dfc381: am
dfe30aa6: Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad
* commit '
72dfc3814578769bbe1317a8cd62180e63ac8e3d':
fix showing wrong image post save
John Hoford [Sat, 12 Oct 2013 00:04:36 +0000 (17:04 -0700)]
am
dfe30aa6: Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad
* commit '
dfe30aa6d008c2aff9fa42a6706867bd2f147425':
fix showing wrong image post save
John Hoford [Sat, 12 Oct 2013 00:02:42 +0000 (00:02 +0000)]
Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad
John Hoford [Sat, 12 Oct 2013 00:00:05 +0000 (17:00 -0700)]
am
de12d6a6: am
e64845e0: am
4c107f27: fixed crash when applying the none filter
* commit '
de12d6a669df152960390caafc791830096a7f56':
fixed crash when applying the none filter
John Hoford [Fri, 11 Oct 2013 23:58:10 +0000 (16:58 -0700)]
am
e64845e0: am
4c107f27: fixed crash when applying the none filter
* commit '
e64845e0a9d13888fa96ae71663027f3a805f9a9':
fixed crash when applying the none filter
John Hoford [Fri, 11 Oct 2013 23:56:23 +0000 (16:56 -0700)]
am
4c107f27: fixed crash when applying the none filter
* commit '
4c107f27eee1c6778c32b3f01f3c628cbcaf0b26':
fixed crash when applying the none filter
John Hoford [Fri, 11 Oct 2013 21:51:11 +0000 (14:51 -0700)]
fix showing wrong image post save
bug:
11174327
bug:
11130809
Change-Id: I53ee2f73c5a871d9255fea547a0d93a989f15a4f
John Hoford [Fri, 11 Oct 2013 22:18:52 +0000 (15:18 -0700)]
fixed crash when applying the none filter
bug:
11188884
Change-Id: Id1f5e72b15b307eedccd5d582d3632500f19fdbd
nicolasroard [Fri, 11 Oct 2013 20:05:52 +0000 (13:05 -0700)]
am
95ce04cb: am
34c84972: am
7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad
* commit '
95ce04cb54f38788384154630737b628c65876c6':
Fix crash
nicolasroard [Fri, 11 Oct 2013 20:03:42 +0000 (13:03 -0700)]
am
34c84972: am
7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad
* commit '
34c84972f83c3bb38c4308654ae2313bbd8aed17':
Fix crash
nicolasroard [Fri, 11 Oct 2013 20:00:53 +0000 (13:00 -0700)]
am
7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad
* commit '
7835ea8c351802dd6d4c7361fd24a72124a7897d':
Fix crash
nicolasroard [Fri, 11 Oct 2013 19:57:06 +0000 (19:57 +0000)]
Merge "Fix crash" into gb-ub-photos-carlsbad
John Hoford [Fri, 11 Oct 2013 19:49:59 +0000 (12:49 -0700)]
am
0d14dcb1: am
e74c8a0e: am
b0f61454: Merge "fix RTL menu issues" into gb-ub-photos-carlsbad
* commit '
0d14dcb1e09ba98a2bc90c281d914a4c56b64b07':
fix RTL menu issues
John Hoford [Fri, 11 Oct 2013 18:34:33 +0000 (11:34 -0700)]
am
e74c8a0e: am
b0f61454: Merge "fix RTL menu issues" into gb-ub-photos-carlsbad
* commit '
e74c8a0e24857181a9dc0589b48efdeed9925bfd':
fix RTL menu issues
John Hoford [Fri, 11 Oct 2013 18:30:58 +0000 (11:30 -0700)]
am
b0f61454: Merge "fix RTL menu issues" into gb-ub-photos-carlsbad
* commit '
b0f614548813ecd1542745f35900856c05d70948':
fix RTL menu issues
John Hoford [Fri, 11 Oct 2013 18:28:33 +0000 (18:28 +0000)]
Merge "fix RTL menu issues" into gb-ub-photos-carlsbad
nicolasroard [Fri, 11 Oct 2013 18:27:34 +0000 (11:27 -0700)]
Fix crash
bug:
11185130
Change-Id: I8aaaeb706cb0b2db106c266a84dad0e55d76998f
Alan Newberger [Fri, 11 Oct 2013 18:07:56 +0000 (11:07 -0700)]
am
fcdb6c69: am
ee0b70cd: am
c58ff057: Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad
* commit '
fcdb6c6923e66bc831b5b004e70ab08094c724e3':
Introduce FilterShowHelper for versioning visibility
Alan Newberger [Fri, 11 Oct 2013 18:02:29 +0000 (11:02 -0700)]
am
ee0b70cd: am
c58ff057: Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad
* commit '
ee0b70cd8cbdbf0e54bae2798d386a39cb7a091b':
Introduce FilterShowHelper for versioning visibility
Mangesh Ghiware [Fri, 11 Oct 2013 18:01:10 +0000 (11:01 -0700)]
am
8d508422: am
2737021b: am
d180bb94: Use existing crop activity as fallback.
* commit '
8d50842226fbeb9d4415a40d8b705e9cb581fa5c':
Use existing crop activity as fallback.
Alan Newberger [Fri, 11 Oct 2013 18:00:24 +0000 (11:00 -0700)]
am
c58ff057: Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad
* commit '
c58ff0578e2124f75b5a974ed821ee5766da2455':
Introduce FilterShowHelper for versioning visibility
Alan Newberger [Fri, 11 Oct 2013 17:59:07 +0000 (17:59 +0000)]
Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad
Mangesh Ghiware [Fri, 11 Oct 2013 17:59:04 +0000 (10:59 -0700)]
am
2737021b: am
d180bb94: Use existing crop activity as fallback.
* commit '
2737021b671fb7c322e1e348c89d55d1263a426d':
Use existing crop activity as fallback.
Mangesh Ghiware [Fri, 11 Oct 2013 17:57:09 +0000 (10:57 -0700)]
am
d180bb94: Use existing crop activity as fallback.
* commit '
d180bb94f9b9fc9846f08479fc952bb6f5fe70de':
Use existing crop activity as fallback.
Mangesh Ghiware [Fri, 11 Oct 2013 17:03:29 +0000 (10:03 -0700)]
Use existing crop activity as fallback.
Bug:
11156898
Change-Id: I77f4788870a4f3f499ba59e168f04922a95a03c4
John Hoford [Fri, 11 Oct 2013 17:08:22 +0000 (10:08 -0700)]
fix RTL menu issues
bug:
11184806
Change-Id: I4562b13afc34069ed72a7bf497825abdd57a00ba
Alan Newberger [Thu, 10 Oct 2013 21:17:58 +0000 (14:17 -0700)]
Introduce FilterShowHelper for versioning visibility
This CL creates FilterShowHelper which will first be used to ensure Versions is active.
Bug:
10734094
Change-Id: I7ac7d99af8818e2599ea2f2a0e64b9c3433a9002
nicolasroard [Fri, 11 Oct 2013 02:21:11 +0000 (19:21 -0700)]
am
381df73d: am
d7fd034b: am
b052e5c7: Use AOSP borders by default
* commit '
381df73d4e519332252b28c15e27562dcbd22561':
Use AOSP borders by default
nicolasroard [Fri, 11 Oct 2013 02:20:19 +0000 (19:20 -0700)]
am
8d89dbb0: am
8444b257: am
1ebeed45: Fix edge case cache issues
* commit '
8d89dbb0555715bcdf6f65c9889766e7eccc67f1':
Fix edge case cache issues
nicolasroard [Fri, 11 Oct 2013 02:16:40 +0000 (19:16 -0700)]
am
d7fd034b: am
b052e5c7: Use AOSP borders by default
* commit '
d7fd034b94240c0f3ba9588a0fd9ad0fa6dfdf25':
Use AOSP borders by default
nicolasroard [Fri, 11 Oct 2013 02:14:45 +0000 (19:14 -0700)]
am
b052e5c7: Use AOSP borders by default
* commit '
b052e5c72d27c3da585e345d758170c3ab26cbc8':
Use AOSP borders by default
nicolasroard [Fri, 11 Oct 2013 01:37:43 +0000 (18:37 -0700)]
Use AOSP borders by default
bug:
11132358
bug:
11130809
Change-Id: I57bcfeec35cde1095df5c26776aaa1a06cd110aa
nicolasroard [Fri, 11 Oct 2013 00:05:38 +0000 (17:05 -0700)]
am
8444b257: am
1ebeed45: Fix edge case cache issues
* commit '
8444b257b0053c4bde274138350039c0880a5abf':
Fix edge case cache issues
nicolasroard [Fri, 11 Oct 2013 00:02:51 +0000 (17:02 -0700)]
am
1ebeed45: Fix edge case cache issues
* commit '
1ebeed45d206ed306eb149e4e63242b1b55558ef':
Fix edge case cache issues
nicolasroard [Thu, 10 Oct 2013 22:46:44 +0000 (15:46 -0700)]
Fix edge case cache issues
Also add additional debugging information.
bug:
10856175
Change-Id: Ie352e2dd6a86511abea97b622ed7c3b3cccd8479
John Hoford [Thu, 10 Oct 2013 17:01:03 +0000 (10:01 -0700)]
am
a3460803: am
1f661bd8: am
96e6ddb2: fix Gallery crashes with empty PTP device
* commit '
a34608035da126e4bd5f299e8229b81bc40a2f1a':
fix Gallery crashes with empty PTP device
John Hoford [Thu, 10 Oct 2013 16:55:59 +0000 (09:55 -0700)]
am
1f661bd8: am
96e6ddb2: fix Gallery crashes with empty PTP device
* commit '
1f661bd86a7936e32cef42e3ce6aa0c10a7c0c49':
fix Gallery crashes with empty PTP device
John Hoford [Thu, 10 Oct 2013 16:53:34 +0000 (09:53 -0700)]
am
96e6ddb2: fix Gallery crashes with empty PTP device
* commit '
96e6ddb24dd149aa991ef007a394ea9592066d14':
fix Gallery crashes with empty PTP device
John Hoford [Thu, 10 Oct 2013 15:59:17 +0000 (08:59 -0700)]
fix Gallery crashes with empty PTP device
bug:
11152999
Change-Id: I70e4787dc46c0e948712ea4530b8110c36603dfa
The Android Automerger [Thu, 10 Oct 2013 13:01:31 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
John Hoford [Wed, 9 Oct 2013 22:36:03 +0000 (15:36 -0700)]
am
f591448a: am
8e5f2acb: am
fb1884f6: Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad
* commit '
f591448a73e31138e5df884479f3c4766b8be222':
hide popupmenu during rotate
John Hoford [Wed, 9 Oct 2013 22:33:38 +0000 (15:33 -0700)]
am
8e5f2acb: am
fb1884f6: Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad
* commit '
8e5f2acb91ab4ef22b54a1d0502e9a5841e705a3':
hide popupmenu during rotate
John Hoford [Wed, 9 Oct 2013 22:32:12 +0000 (15:32 -0700)]
am
fb1884f6: Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad
* commit '
fb1884f63beb3ab4c94b09aea91b5ad501bc6af6':
hide popupmenu during rotate
John Hoford [Wed, 9 Oct 2013 22:30:02 +0000 (22:30 +0000)]
Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad
OSDN Git Service
