OSDN Git Service

Merge changes I30dfeadc,I186cf812
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 21 Apr 2017 10:48:04 +0000 (10:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 21 Apr 2017 10:48:08 +0000 (10:48 +0000)
commitf3d39e591dfe12e9b18bf2200e64c4b1357806eb
tree731d9620ae8f97cbb520e66b68d82c6b5feb34a4
parent5ab079f4bbf3be9425527ec0444ec6a173703412
parentc92eb4658a579df59df07944fde327ca624ca28d
Merge changes I30dfeadc,I186cf812

* changes:
  Fix and enable test for Trampoline.requestBackup().
  Fix potential NPE in Trampoline.requestBackup().