Neil Fuller c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp ...

Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7

2014-10-02 14:32:37 +01:00

..

res

VideoEditor:IssueID:3396697: Added Preview Test code

2011-02-14 20:59:51 -08:00

src/com/android/mediaframeworktest

resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp

2014-10-02 14:32:37 +01:00

Android.mk

camera2: Update native<->managed camera metadata marshalers

2014-05-13 15:28:24 -07:00

AndroidManifest.xml

camera2: Update native<->managed camera metadata marshalers

2014-05-13 15:28:24 -07:00