tree 8c99cb302542a828619b2528227f0681b5e3e22c
parent 6d7751a13bfab37aed5ae4e9bc6507a8105ba50c
parent 6d795c288388060b185f64cc4e22fbfc25278e83
author Colin Cross <ccross@android.com> 1487919879 +0000
committer android-build-merger <android-build-merger@google.com> 1487919879 +0000

Merge changes Icd5f39ae,I2a4e956c
am: 6d795c2883

Change-Id: Iada421394365a767712b553706a5897b21b2ae5a