Michael Kolb 7d755a6f57 Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp

2014-04-18 00:48:20 +00:00

..

java

am 4abbd0a6: Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev

2014-04-18 00:48:13 +00:00

jni

am 7423510c: am da93c60d: Merge "jni: binder ptrdiff_t compile issues"

2014-04-18 00:47:47 +00:00

res

am 4abbd0a6: Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev

2014-04-18 00:48:13 +00:00

tests

am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev

2014-03-18 22:34:17 +00:00