tree de3268b090958a305529d1f34051bea03bacde46
parent 72d510612f505d4d8439dab144d5c253346aebc2
parent 8872c23e739de38d74f04a8c852ebb5199c905f6
author Michael Kolb <kolby@google.com> 1359492716 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1359492717 +0000

Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce