Andy McFadden e8792ce854 am 923c18b1: Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev ...

* commit '923c18b1421296c2ed37a51d055283e94f99fc53':
  Plumb display name into SurfaceFlinger

2012-09-18 10:03:55 -07:00

..

java

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

2012-09-17 22:54:56 -07:00

jni

am 923c18b1: Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev

2012-09-18 10:03:55 -07:00

res

am 5bc09e26: Merge "Disable notification scans when p2p is connected" into jb-mr1-dev

2012-09-17 21:03:24 -07:00

tests

Per-user content observer APIs

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