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:53 +0000 (22:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Apr 2016 22:30:53 +0000 (22:30 +0000)
commit77422649f1cd565d6238a02da260dd6e087899e5
treec535968993ee30a31c4318d84f4b5fd29149c461
parent4eb3607eb80c93ed4016a7e4af8d1c129b3af186
parenta381455472a814c8dbd98fcb4312f46ed1373c88
Merge "Added defensive code to prevent system crash" into nyc-dev
am: a381455

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

Change-Id: I7a48940b04b3033ab2c5e0f370098749e4fdd8fd