tree bdc0c7b4ff611d6a0af5546c831ee27742113d5a
parent 158bfbece58ffaf79110f503511dc87f90482e03
parent 3cccbf13bc2edd9f0e5f9446a9bc3a9108176a43
author Daniel Xie <dxie@google.com> 1473892542 +0000
committer android-build-merger <android-build-merger@google.com> 1473892542 +0000

Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev am: 253fdc667a  -s ours
am: 3cccbf13bc

Change-Id: I2581fa08b2b9d9875ede207c1fef0dd510e9711f