Jim Miller fbf1d17004 am c6e570db: Merge "Fix camera disambiguation in secure keyguard" into jb-mr1-dev ...

* commit 'c6e570dbadc3689bc80c0516492a3209d5f6742b':
  Fix camera disambiguation in secure keyguard

2012-10-02 14:00:28 -07:00

..

java

am c6e570db: Merge "Fix camera disambiguation in secure keyguard" into jb-mr1-dev

2012-10-02 14:00:28 -07:00

jni

am 217ca3b0: Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev

2012-10-02 13:04:52 -07:00

res

Merge "Fixing up keyguard widget pager layouts" into jb-mr1-dev

2012-10-02 11:29:14 -07:00

tests

Merge "Pass the originating uid to the package verifier" into jb-mr1-dev

2012-09-28 10:58:19 -07:00