Matthew Williams 06485a7c6e Pending op fix didn't merge properly from KLP-dev. ...

Manually merge in Cl c/342668. Add another test to ensure that it
WAI.

Change-Id: Iae603328d525cc71e4e31ad30a13384efc50f823

2013-09-16 15:23:41 -07:00

..

res/raw

…

src/com/android/server

Pending op fix didn't merge properly from KLP-dev.

2013-09-16 15:23:41 -07:00

Android.mk

Migrate to using Mockito directly.

2013-02-19 15:28:19 -08:00

AndroidManifest.xml

…