OSDN Git Service

Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev...
authorMichal Karpinski <mkarpinski@google.com>
Fri, 21 Apr 2017 12:40:00 +0000 (12:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 12:40:00 +0000 (12:40 +0000)
am: c7bc48f1d6  -s ours

Change-Id: Ieda4ac533daeedd487fd57a713407887ffcc67a5


Trivial merge