Victoria Lease 45bdc2c170 am c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev ...

* commit 'c0c0c0e612e1ccf1e55eb2a9338ddfff40d8d7f2':
  Multiuser love for LocationManager

2012-10-09 12:24:42 -07:00

..

java

am c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev

2012-10-09 12:24:42 -07:00

jni

am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev

2012-10-09 00:05:26 -07:00

res

Merge "enforce camera sound according to country code" into jb-mr1-dev

2012-10-09 11:29:11 -07:00

tests

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

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