Amith Yamasani 14e883b25e Fix merge error ...

Didn't apply the recent API change from another CL.

Change-Id: I65ac6108909eca7ac48beabb4a8b7bbedda84249

2012-08-17 16:34:53 -07:00

..

java

Fix merge error

2012-08-17 16:34:53 -07:00

jni

am 050c87f8: am a950daf5: Merge changes Ieb566a2a,I953057cd

2012-08-16 16:43:20 -07:00

res

UserHandle to UserSerialNo mapping

2012-08-17 09:06:10 -07:00

tests

am 050c87f8: am a950daf5: Merge changes Ieb566a2a,I953057cd

2012-08-16 16:43:20 -07:00