OSDN Git Service

Merge "Fix an NPE that can result from a race condition." into oc-dev
authorSundeep Ghuman <sghuman@google.com>
Thu, 4 May 2017 19:25:38 +0000 (19:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 May 2017 19:25:38 +0000 (19:25 +0000)
commit375a306fe34e0ff368447be21af4eff6f37bd692
tree35d5896da0f2b4585ba9317d2230a15eeabdfdbb
parenta21bcbff08cc610acb574d128c3de630bf3e5830
parentd8aa2acea3967e3c875073c04118187b03a4b87e
Merge "Fix an NPE that can result from a race condition." into oc-dev
am: d8aa2acea3

Change-Id: I41bfd05eb74502a034cf1289032ce6a8c50bcbd5