[automerger skipped] Merge "Remove libexif usage from libmedia_jni.so" am: 04077d07d7 -s ours am: a3f4de14cb -s ours
am:6355cc3106-s ours am skip reason: change_id I33128db25b8aae60df7854c61fc2a3873a1bced9 with SHA15954d210d3is in history Change-Id: I5ff450fdf04d454897957325d28c6472ce181d86
This commit is contained in: