Fabrice Di Meglio 3c371b28ef am 0be6a28e: am 08f27b1b: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev ...

* commit '0be6a28ed5f27217d66c69195524d8747a6975bc':
  Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO

2012-10-19 19:22:05 -07:00

..

java

am 0be6a28e: am 08f27b1b: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev

2012-10-19 19:22:05 -07:00

jni

am 3786a9b9: am 07a9ebd1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev

2012-10-17 19:23:27 -07:00

res

am 01d2c64a: am 7404f28b: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev

2012-10-19 11:07:12 -07:00

tests

am 9396f183: resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp

2012-10-19 17:20:03 -07:00