tree 7824a093bc4de18eba9390bfae8ebc09f3ee07bc
parent f79e9db613e0dfa1d35993b517d498b621b99eee
parent cd9c77c5b6ea00563625ab389f95fbd397f6f2d2
author Lorenzo Colitti <lorenzo@google.com> 1502673602 +0000
committer android-build-merger <android-build-merger@google.com> 1502673602 +0000

Merge changes I24d83b88,I2ab9269d
am: cd9c77c5b6

Change-Id: Ia43dbb798fa31bbcd3d830d6f0293685e81a114c