tree da92ce9fd395e557c13768e7d6338764d0b0b0b5
parent 9fcdfb26f988b23ef12d25f2457d6470f11129d4
parent 418a818639a2dad7ed9f06b0785ed4f55966f56e
author calderwoodra <calderwoodra@google.com> 1516765916 +0000
committer android-build-merger <android-build-merger@google.com> 1516765916 +0000

Merge changes Iccee9278,I04305998
am: 418a818639

Change-Id: I6d71bca44b6e7aeeefad494019d0e11b1be354bd