Makoto Onuki 4304f6f10d Merge "Fix potential crash loop" into nyc-dev ...

am: 619f468

* commit '619f4682a3ba41d1d39356f16c9b1ec394b01464':
  Fix potential crash loop

2016-03-25 19:23:52 +00:00

..

android

Merge "Fix potential crash loop" into nyc-dev

2016-03-25 19:23:52 +00:00

google/android

…