Elliott Hughes a920f25fe5 resolved conflicts for merge of fca0f92e to stage-aosp-master ...

Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74

2013-06-28 16:41:19 -07:00

..

java

resolved conflicts for merge of fca0f92e to stage-aosp-master

2013-06-28 16:41:19 -07:00

jni

am 11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."

2013-06-17 18:21:41 -07:00

res

Merge "Lockscreen : Reference correct layout"

2013-06-24 21:15:45 +00:00

tests

resolved conflicts for merge of fca0f92e to stage-aosp-master

2013-06-28 16:41:19 -07:00