OSDN Git Service

Merge "Fix system crash" into oc-dr1-dev
authorJulia Reynolds <juliacr@google.com>
Fri, 14 Jul 2017 13:49:13 +0000 (13:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 13:49:13 +0000 (13:49 +0000)
commite58e833819c05bffe21f03abf9e47a557f8e601e
tree7b66ad10150f387ba5e181db6a53be68d56f5ede
parent44d0cda8efce506c75d9546d2e4de4686bf70d58
parent5a0958ed0be108585f4dccfd8f911b26e53b64bb
Merge "Fix system crash" into oc-dr1-dev
am: 5a0958ed0b

Change-Id: Icd087a48c50670bc5a59c34a13ecb3df5d5529e2