tree a8e48de99f4bdc45cac35c85f56cc8d9670d8bfe
parent 46d6766b1294e853a836b7b3167d8c93dc4ce2c2
parent 03249752afd7d870ff708bf47d687a1643367ec5
author calderwoodra <calderwoodra@google.com> 1505161379 +0000
committer android-build-merger <android-build-merger@google.com> 1505161379 +0000

Merge changes I6af1fc7d,I0627d54a
am: 03249752af

Change-Id: I9db97f9b06241202d9a8971ac37f86c2a670ea9a