OSDN Git Service

Merge "Fix NPE when runnin testActivity" into nyc-dev
authorDiego Perez <diegoperez@google.com>
Thu, 7 Apr 2016 19:06:38 +0000 (19:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Apr 2016 19:06:38 +0000 (19:06 +0000)
commitd1acd13cb00d21d3d84005952f07d2c6629c144b
tree1367089ed3000e4b569ce507f1bcc343b55df39a
parent9f288d59310ed2c0e30f6c7acd448a485b96984f
parent2155ad82042eb2f69b9c9d2a9ecf3884d265ad7b
Merge "Fix NPE when runnin testActivity" into nyc-dev
am: 2155ad8

* commit '2155ad82042eb2f69b9c9d2a9ecf3884d265ad7b':
  Fix NPE when runnin testActivity

Change-Id: I5b0c4b2686ebee6814866edf0c9e30e12ea14d26