am 5cf79292: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit '5cf79292b8838880e6059bca7e2415161d0dfb84':
  JOO86
  JOO85B
  JOO85
  JOO84
  JOO83C
  Include videoeditor_jni in sdk product build.
  JOO83B
  JOO83
  fix PDK build
  Use prebuilt for PDK builds.
  JOO82C
  JOO82B

...

This commit is contained in:

The Android Open Source Project 2012-09-24 10:13:02 -07:00 committed by Android Git Automerger

parent 9394498a93 5cf79292b8

commit fdbb9fd45e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available