Michael Kolb dfbcf0ca33 am f4399e72: resolved conflict for merge from d42eeab2 to master ...

* commit 'f4399e7243c35bef3eabfd20582246818a0bbbd3':
  Populate isRound from config.xml to WindowInsets

2014-04-18 01:17:38 +00:00

..

assets

…

res

am f4399e72: resolved conflict for merge from d42eeab2 to master

2014-04-18 01:17:38 +00:00

Android.mk

…

AndroidManifest.xml

Merge "Add RouteProviders to the new Media APIs"

2014-04-17 22:13:30 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…