OSDN Git Service

am c9099fce: (-s ours) am efa5991f: Fix a NULL-pointer crash
authorPavlin Radoslavov <pavlin@google.com>
Thu, 27 Aug 2015 10:55:17 +0000 (10:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:55:17 +0000 (10:55 +0000)
* commit 'c9099fce3a42fcb67b920b64e9629734b4195e98':


Trivial merge