tree 62036238e1c84f4f3a92e07bf88ef26b20160a77
parent e556005331b004498b4972f55f04a0e2a905d11c
parent 5b401f8b8b8d498a87dcfcfc29e00746c794e70d
author Eino-Ville Talvala <etalvala@google.com> 1339173630 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339173630 -0700

am 5b401f8b: am e245ecdc: Merge "Add LegacyCamera to SDK product" into jb-dev

* commit '5b401f8b8b8d498a87dcfcfc29e00746c794e70d':
  Add LegacyCamera to SDK product