tree 2ba8931b53d3de8ca78b844bb819e4837ed5e55a
parent 9146a1d38c583b98d437d75230479afe2447ff1b
parent 3bfb4b09bff00a5c228a5c727a4a060ced473118
author Bruce Chen <chenbruce@google.com> 1563967777 -0700
committer android-build-merger <android-build-merger@google.com> 1563967777 -0700

Merge "Dead code removal - remove res->options"
am: 113905bce1

Change-Id: Idf491ebe8fef458bb4e3f1b62d7f4a178415d40b