Kenny Root 6a0db59901 resolved conflicts for merge of e0b14ea7 to master ...

Change-Id: Ie018d3e2eba1eb2d655c153880e1951b68c2bd51

2013-12-13 15:59:51 -08:00

..

java/android

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

jni

am 84f4ad80: am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify."

2013-11-13 15:26:53 -08:00

lib

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

mca

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

tests

Camera2: add metadata override

2013-10-07 08:02:25 -07:00