Raph Levien 35b5780ec5 am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev ...

* commit '2ed9a7e5ac3923b9459dc02b3a04e075ae4ea627':
  Refine resolution order for typeface and fontFamily

2015-01-29 22:36:46 +00:00

..

java

am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev

2015-01-29 22:36:46 +00:00

jni

am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev

2015-01-27 18:33:46 +00:00

res

Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839

2015-01-29 05:00:44 +00:00

tests

am b5108949: am e4a031e3: Merge "New trick to install bad dex file."

2015-01-20 22:01:26 +00:00