tree ab21b9e95ddbe7362f0760f2f2393e0e69534d0b
parent 18689f2c2a4634ef23e2bc352a00b8e3bc757374
parent a00313a33fd6e2f365a88def852148a0a675534c
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1513639906 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1513639906 +0000

[automerger] resolve merge conflicts of 6606da434d2e753630de4d2a2eded671236dde09 to oc-mr1-jetpack-dev am: a00313a33f

Change-Id: Ied0691967f196d1a7d9994944588961c31ed7b6c