summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* A couple of fixesKévin PETIT2014-03-053-4/+4
* Merge "gallery: change typo '&&' to '||'"Nick Kralevich2014-02-011-1/+1
|\
| * gallery: change typo '&&' to '||'Leavitt Zhang2014-01-281-1/+1
|/
* am 062bd465: Merge "jni: fix C99 inline linking"Nick Kralevich2013-12-061-8/+8
|\
| * Merge "jni: fix C99 inline linking"Nick Kralevich2013-12-061-8/+8
| |\
| | * jni: fix C99 inline linkingsynergydev2013-12-061-8/+8
| |/
* | Merge commit '38ef95e0802868a39ab33bcb279e20a21ec41fd8' into HEADThe Android Open Source Project2013-12-0520-39/+80
|\ \ | |/ |/|
| * am 79dcd8f4: (-s ours) am 3715fb1f: (-s ours) Merge "Import translations. DO ...Baligh Uddin2013-11-130-0/+0
| |\
| | * am 3715fb1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-11-130-0/+0
| | |\
| | | * Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-11-141-1/+1
| | | |\
| | | | * Import translations. DO NOT MERGEBaligh Uddin2013-11-131-1/+1
| * | | | am e98e7dbc: (-s ours) am 78db2b06: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-130-0/+0
| |\| | |
| | * | | am 78db2b06: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-130-0/+0
| | |\| |
| | | * | Import translations. DO NOT MERGEBaligh Uddin2013-11-132-6/+6
| | | |/
| * | | am 63e87c68: (-s ours) am 8689b2f5: (-s ours) Merge "Import translations. DO ...Baligh Uddin2013-11-050-0/+0
| |\| |
| | * | am 8689b2f5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-11-050-0/+0
| | |\|
| | | * Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-11-053-4/+4
| | | |\
| | | | * Import translations. DO NOT MERGEBaligh Uddin2013-11-043-4/+4
| * | | | am be12478d: (-s ours) am a4d7d822: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-050-0/+0
| |\| | |
| | * | | am a4d7d822: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-050-0/+0
| | |\| |
| | | * | Import translations. DO NOT MERGEBaligh Uddin2013-11-044-108/+108
| | | |/
| * | | am 350f7e3d: am 00dfa8a1: am 1619b3c3: Fix infinite spinner dialognicolasroard2013-11-041-1/+1
| |\| |
| | * | am 00dfa8a1: am 1619b3c3: Fix infinite spinner dialognicolasroard2013-11-021-1/+1
| | |\|
| | | * am 1619b3c3: Fix infinite spinner dialognicolasroard2013-11-021-1/+1
| | | |\
| | | | * Fix infinite spinner dialognicolasroard2013-11-011-1/+1
| * | | | am c23e8d86: am 07986225: am c82e65b4: Merge "Disable geometry button if tiny...nicolasroard2013-11-042-0/+8
| |\| | |
| | * | | am 07986225: am c82e65b4: Merge "Disable geometry button if tiny planet is he...nicolasroard2013-11-012-0/+8
| | |\| |
| | | * | am c82e65b4: Merge "Disable geometry button if tiny planet is here" into gb-u...nicolasroard2013-11-012-0/+8
| | | |\|
| | | | * Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carl...nicolasroard2013-11-022-0/+8
| | | | |\
| | | | | * Disable geometry button if tiny planet is herenicolasroard2013-11-012-0/+8
| * | | | | am d5dbfe7b: am d6644d60: am c0c6f058: Merge "fix Gallery crash using crop" i...John Hoford2013-11-041-0/+1
| |\| | | |
| | * | | | am d6644d60: am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-pho...John Hoford2013-11-011-0/+1
| | |\| | |
| | | * | | am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbadJohn Hoford2013-11-011-0/+1
| | | |\| |
| | | | * | Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbadJohn Hoford2013-11-021-0/+1
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * fix Gallery crash using cropJohn Hoford2013-11-011-0/+1
| * | | | | am c4354f79: am 164de4d8: am 21b61954: Gallery should show up in recents even...Alan Newberger2013-10-311-1/+0
| |\| | | |
| | * | | | am 164de4d8: am 21b61954: Gallery should show up in recents even when run via...Alan Newberger2013-10-311-1/+0
| | |\| | |
| | | * | | am 21b61954: Gallery should show up in recents even when run via shortcutAlan Newberger2013-10-311-1/+0
| | | |\| |
| | | | * | Gallery should show up in recents even when run via shortcutAlan Newberger2013-10-311-1/+0
| | | | |/
| * | | | am 2c237f11: Merge "Fix invalid private access."Narayan Kamath2013-10-311-2/+2
| |\ \ \ \
| * \ \ \ \ am 71bf4978: am 48372e31: am ebbcc394: Avoid crash if user disables Camera wh...Alan Newberger2013-10-301-1/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 48372e31: am ebbcc394: Avoid crash if user disables Camera while Gallery i...Alan Newberger2013-10-301-1/+7
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | am ebbcc394: Avoid crash if user disables Camera while Gallery is openAlan Newberger2013-10-301-1/+7
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Avoid crash if user disables Camera while Gallery is openAlan Newberger2013-10-301-1/+7
| * | | | | am a0e3a6ae: (-s ours) am dcd1b260: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-10-280-0/+0
| |\| | | |
| | * | | | am dcd1b260: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-10-280-0/+0
| | |\| | |
| | | * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-283-4/+4
| * | | | | am 9744244d: am 4edb3438: am ec036c64: Add white overscroll assets to Gallery...Alan Newberger2013-10-288-0/+0
| |\| | | |
| | * | | | am 4edb3438: am ec036c64: Add white overscroll assets to Gallery2 for v19Alan Newberger2013-10-288-0/+0
| | |\| | |
| | | * | | am ec036c64: Add white overscroll assets to Gallery2 for v19Alan Newberger2013-10-258-0/+0
| | | |\| |