tree 12f798f38080abff6d80d84cf00649267a029e4c
parent e5eaf129a87f47a6ec41a9de57bdb1ca988b919c
parent ebb8450cd06c8506406c483f2b10716b6e0fc87b
author Garfield, Tan <xutan@google.com> 1469571762 +0000
committer android-build-merger <android-build-merger@google.com> 1469571762 +0000

DO NOT MERGE: Change the order of 2 statements to remove race.
am: ebb8450cd0

Change-Id: Ica31fe1487551db935714f3d89543aff043d40b6