Dan Sandler 138a7aea27 am 8c2079c2: Merge "Platlogo: The icon now matches the activity." into lmp-preview-dev ...

* commit '8c2079c2ce89bb7311f6db08f5f0d09e262d650f':
  Platlogo: The icon now matches the activity.

2014-06-05 09:47:47 +00:00

..

java

Merge commit '21483b9f' into manualmerge

2014-06-04 20:59:13 -07:00

jni

am 626b82f6: Merge "Query style from asset-created font (Minikin)" into lmp-preview-dev

2014-06-04 22:19:56 +00:00

res

am 8c2079c2: Merge "Platlogo: The icon now matches the activity." into lmp-preview-dev

2014-06-05 09:47:47 +00:00

tests

Merge "Reenable DynamicRotationList for language-switching-aware IMEs"

2014-06-03 00:51:32 +00:00