summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove dependencies on FloatMathNeil Fuller2014-10-0213-44/+31
* am 53fd3c7c: Merge "Gallery2 : only build for 32-bit"Narayan Kamath2014-05-271-0/+2
|\
| * Merge "Gallery2 : only build for 32-bit"Narayan Kamath2014-05-271-0/+2
| |\
| | * Gallery2 : only build for 32-bitAndreas Gampe2014-05-271-0/+2
| |/
* | Merge commit 'a9c4376daac3b9deda0c617b6df393e741885f37' into HEADBill Yi2014-04-291-0/+3
|\ \ | |/ |/|
| * am 7a6bd46d: Merge "A couple of fixes"Narayan Kamath2014-03-113-4/+4
| |\
| * \ am e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"Nick Kralevich2014-03-071-1/+1
| |\ \
| * \ \ am 36f05fbe: (-s ours) am 09fbf351: (-s ours) Merge "Import translations. DO ...Baligh Uddin2014-02-200-0/+0
| |\ \ \
| | * \ \ am 09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-200-0/+0
| | |\ \ \
| | | * \ \ Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-202-3/+3
| | | |\ \ \
| | | | * | | Import translations. DO NOT MERGEBaligh Uddin2014-02-202-3/+3
| * | | | | | am 7537e615: (-s ours) am 53851696: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-02-200-0/+0
| |\| | | | |
| | * | | | | am 53851696: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-02-200-0/+0
| | |\| | | |
| | | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-202-4/+4
| | | |/ / /
| * | | | | am 7cbf5af8: (-s ours) am e1f9ccbe: (-s ours) Merge "Import translations. DO ...Baligh Uddin2014-01-060-0/+0
| |\| | | |
| | * | | | am e1f9ccbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-01-060-0/+0
| | |\| | |
| | | * | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-01-071-1/+1
| | | |\ \ \
| | | | * | | Import translations. DO NOT MERGEBaligh Uddin2014-01-061-1/+1
| * | | | | | am eba4fb66: (-s ours) am e0659df8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-01-060-0/+0
| |\| | | | |
| | * | | | | am e0659df8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-01-060-0/+0
| | |\| | | |
| | | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-01-061-2/+2
| | | |/ / /
| * | | | | am 6f99876d: (-s ours) am 76310806: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-190-0/+0
| |\| | | |
| | * | | | am 76310806: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-190-0/+0
| | |\| | |
| | | * | | Import translations. DO NOT MERGEBaligh Uddin2013-12-185-7/+7
| * | | | | am 63f898ac: (-s ours) am 299926e6: (-s ours) Merge "Import translations. DO ...Baligh Uddin2013-12-120-0/+0
| |\| | | |
| | * | | | am 299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-120-0/+0
| | |\| | |
| | | * | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-12-124-4/+4
| | | |\ \ \
| | | | * | | Import translations. DO NOT MERGEBaligh Uddin2013-12-114-4/+4
| * | | | | | am f0ab16cf: (-s ours) am b24fcaae: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-120-0/+0
| |\| | | | |
| | * | | | | am b24fcaae: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-120-0/+0
| | |\| | | |
| | | * | | | Import translations. DO NOT MERGEBaligh Uddin2013-12-113-6/+6
| | | |/ / /
| * | | | | am 044648be: am 062bd465: Merge "jni: fix C99 inline linking"Nick Kralevich2013-12-061-8/+8
| |\ \ \ \ \
| * \ \ \ \ \ am bb23e198: Merge commit \'38ef95e0802868a39ab33bcb279e20a21ec41fd8\' into HEADThe Android Open Source Project2013-12-050-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am b269d503: Merge commit \'289306f103b181378d5d58850cf61495facc3204\' into HEADThe Android Open Source Project2013-11-220-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 07de1cf6: (-s ours) am ded9ab3b: (-s ours) am 76ad19f1: (-s ours) Merge "I...Baligh Uddin2013-11-210-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | am ded9ab3b: (-s ours) am 76ad19f1: (-s ours) Merge "Import translations. DO ...Baligh Uddin2013-11-210-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | am 76ad19f1: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-11-210-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbadBaligh Uddin2013-11-224-6/+6
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-11-214-6/+6
| * | | | | | | | | | am 4c8189fc: (-s ours) am 2a6118a6: (-s ours) am daac361f: (-s ours) Import t...Baligh Uddin2013-11-210-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | am 2a6118a6: (-s ours) am daac361f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-210-0/+0
| | |\| | | | | | | |
| | | * | | | | | | | am daac361f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-210-0/+0
| | | |\| | | | | | |
| | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-11-217-116/+116
| | | | |/ / / / / /
| * | | | | | | | | am 91628475: am 947478b6: am aa22947b: Fix the thumbnail generation.ztenghui2013-11-181-0/+3
| |\| | | | | | | |
| | * | | | | | | | am 947478b6: am aa22947b: Fix the thumbnail generation.ztenghui2013-11-181-0/+3
| | |\| | | | | | |
| | | * | | | | | | am aa22947b: Fix the thumbnail generation.ztenghui2013-11-181-0/+3
| | | |\| | | | | |
| | | | * | | | | | Fix the thumbnail generation.ztenghui2013-11-181-0/+3
* | | | | | | | | | Merge "Use basic editor for sharpen filter."Alan Newberger2014-04-211-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use basic editor for sharpen filter.Jun Su2014-02-231-1/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled bu...Ying Wang2014-04-181-8/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |