Makoto Onuki b59582fd51 Merge "Fix potential crash loop" into nyc-dev am: 619f468 ...

am: 4304f6f

* commit '4304f6f10d153d3976aee862f468e6493b16d61b':
  Fix potential crash loop

2016-03-25 19:26:33 +00:00

..

java

Merge "Fix potential crash loop" into nyc-dev am: 619f468

2016-03-25 19:26:33 +00:00

jni

Merge "Update pixelRef genID when reusing pixels in RecyclingClippingPixelAllocator." into nyc-dev am: 1cffbda

2016-03-25 19:04:16 +00:00

res

Merge "Update documentation for the READ_PHONE_STATE permission" into nyc-dev am: 5feb8cb

2016-03-25 19:26:32 +00:00

tests

Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev am: 3e5bf78

2016-03-24 13:41:42 +00:00