Andy McFadden 923c18b142 Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev

2012-09-18 09:23:30 -07:00

..

java

Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev

2012-09-17 22:53:21 -07:00

jni

Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev

2012-09-18 09:23:30 -07:00

res

Merge "Disable notification scans when p2p is connected" into jb-mr1-dev

2012-09-17 20:58:42 -07:00

tests

Per-user content observer APIs

2012-09-17 16:35:36 -07:00