Dianne Hackborn db8dee7f9e Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a am: c9aaec43a6 ...

am: 1d185fbad7

* commit '1d185fbad7bbd1139039283b642655b150884108':
  Work on issue #29042642: Watchdog going off

Change-Id: I659acd8ca9d2b1ddd7992d1c079dd968e60befad

2016-06-02 19:03:55 +00:00

..

java

Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a am: c9aaec43a6

2016-06-02 19:03:55 +00:00

jni

Merge "Use SkMatrix to compute pdf transformation."

2016-05-31 23:32:18 +00:00

res

Merge "Changing user switching messages for demo mode" into nyc-mr1-dev am: 5ac8499b25

2016-06-02 18:55:33 +00:00

tests

Merge "Fix crash with intent-less actions" into nyc-dev am: ac2b44f502 am: 7a845c5283

2016-05-31 21:15:31 +00:00