tree 953d5cdc909cb8a923e198625f3d9b0d9bf21bf3
parent 6b93f509893548b8ad13f325b17611c16176d6fe
parent df37f1fa7437dae38925636d1109d7217ea4c1c8
author Marie Janssen <jamuraa@google.com> 1482174063 +0000
committer android-build-merger <android-build-merger@google.com> 1482174063 +0000

Merge changes I546d7abc,I32163278 into nyc-mr2-dev
am: df37f1fa74

Change-Id: I082c8d392bd693ec0cad019c24bc03829dd6bad0