tree ec9aeaeaea6bee6ed1b9e6962eda9af226f01f5c
parent 16687c5ae5285c8b389ff8de1f68d1c62d7d8383
parent ab632c60b80d560a534b85fa20e3fab82d8ff92b
author Colin Cross <ccross@android.com> 1468623120 +0000
committer android-build-merger <android-build-merger@google.com> 1468623120 +0000

resolve merge conflicts of 1e92cfb to stage-aosp-master am: 4cca8a5573 am: 2017d68910
am: ab632c60b8

Change-Id: I123f98c5d24ec63ca784d4e29b507f9501fbc2c0