Danielle Millett 855bdf6500 am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev ...

* commit '85a4ac9281f5e592dead0f20146e4f154efd7c78':
  Face Unlock is shown correctly during a phone call - fix b/7271718

2012-10-11 17:11:50 -07:00

..

java

am 1cf5bd2a: am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev

2012-10-11 17:11:19 -07:00

jni

am d2d7d5c8: am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev

2012-10-11 00:15:57 -07:00

res

am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev

2012-10-11 17:11:50 -07:00

tests

Fix build, only invalidate when creating user.

2012-10-10 00:01:26 -07:00