Kenny Root ad0090e7b8 resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aosp ...

Change-Id: I9ae49075935f0e9ec432ce9d828ee26a4fcdb44c

2012-10-17 10:02:22 -07:00

..

java

am cccf85c2: am 8e614501: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev

2012-10-16 19:28:28 -07:00

jni

resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aosp

2012-10-17 10:02:22 -07:00

res

am ac8b732e: am 48994ce9: Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev

2012-10-16 17:33:23 -07:00

tests

Fix build, only invalidate when creating user.

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