Makoto Onuki bdfb3aada3 Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev ...

am: 5b9d876ef5

* commit '5b9d876ef5bf4613d9ef89148c1ab021c473c02e':
  ShortcutManaegr: bug fixes

Change-Id: I3823ba8a62a853d0ee49ec7626778b8fa09adbab

2016-05-04 21:42:26 +00:00

..

java

Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev

2016-05-04 21:42:26 +00:00

jni

Merge "stop leaking SkPDFDocument" into nyc-dev

2016-05-03 19:35:29 +00:00

res

Import translations. DO NOT MERGE

2016-05-03 23:07:15 -07:00

tests

Merge "Ensure local settings caches are not stale" into nyc-dev

2016-04-26 18:47:52 +00:00