Dianne Hackborn 59ad17ed08 am 99b23e2c: am fae0d662: Merge "Nested fragments." into jb-mr1-dev ...

* commit '99b23e2c873ff6df5f6609bc87a3bdb9ae33e5ba':
  Nested fragments.

2012-09-06 11:48:43 -07:00

..

java

am 99b23e2c: am fae0d662: Merge "Nested fragments." into jb-mr1-dev

2012-09-06 11:48:43 -07:00

jni

am 54afe6ab: am f87633f3: Merge "update to new SurfaceComposerClient API" into jb-mr1-dev

2012-09-04 20:34:19 -07:00

res

Merge "Import translations. DO NOT MERGE"

2012-09-06 11:45:18 -07:00

tests

Remove Binder.getOrigCallingUid().

2012-08-31 15:11:13 -07:00