tree ee72b98d10f208ffed92f31ee00d8e1d372e716c
parent a329512ef358887bbe1d61ea9493b510a41015f7
parent d18d68b96f294b2593c024120c9e35f1d79d7be9
author Jayachandran Chinnakkannu <jayachandranc@google.com> 1523040147 -0700
committer android-build-merger <android-build-merger@google.com> 1523040147 -0700

Merge "Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED" am: 0222c2cac1
am: d18d68b96f

Change-Id: If20f74a2f0cd5618ae56bbb9488bacd551cabacd