Andreas Gampe 2cabf4a93d Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp

2014-11-19 00:20:49 +00:00

..

java

Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp

2014-11-19 00:20:49 +00:00

jni

am f1c84568: am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev

2014-11-18 22:57:02 +00:00

res

am df57b22b: am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev

2014-11-19 00:19:34 +00:00

tests

am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev

2014-11-13 00:40:28 +00:00