tree 4437b508ed5013a31a2c3a177491454964fc5ba3
parent 617cedac2f18f387b72bbc644e9489fe9bfcdf93
parent aed7048ce0c8ff20a2ed7ce46a848d8af1d3142d
author Felipe Leme <felipeal@google.com> 1470322278 +0000
committer android-build-merger <android-build-merger@google.com> 1470322278 +0000

Merge changes from topic 'bug_30451114' into nyc-mr1-dev
am: aed7048ce0

Change-Id: I31bda3b9df0ad7c56c3a932287eeaf301af3ba13