tree 1ed544a83c0e9515a858ea27569e949445f8f825
parent d04de525609a03a2c7aca0255ee7ca3428d004e8
parent f78a2f821c7bf87f5d37866969bb612ee4b72a16
author Colin Cross <ccross@android.com> 1487737919 +0000
committer android-build-merger <android-build-merger@google.com> 1487737919 +0000

Merge "Use ifndef or ifeq () instead of ifeq """ am: 1948f64dd5
am: f78a2f821c

Change-Id: Ibd03814549dd6499890eaed07e0bb08e5ce63c6e