OSDN Git Service

Merge "Added defensive code to prevent system crash" into nyc-dev
authorLifu Tang <lifu@google.com>
Wed, 20 Apr 2016 22:30:55 +0000 (22:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Apr 2016 22:30:55 +0000 (22:30 +0000)
am: a381455

* commit 'a381455472a814c8dbd98fcb4312f46ed1373c88':
  Added defensive code to prevent system crash

Change-Id: I97dd4a994c86bf9bc845de08a8ff9c303bb86240


Trivial merge