Merge changes I219c2b3a,I7af6fe67
authorMika Isojärvi <misojarvi@google.com>
Mon, 25 Jul 2016 20:45:40 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:45:40 +0000 (20:45 +0000)
commit7d8ddf4d02343d83548ffbd0341f6a2a78d55e81
treead3393a12396569626a6254d6d340b04f2401e27
parent0c8837f1e3f8dfce409ee65563f31c45e3df7b21
parent01cc5733bac74173592b3d6d4dcdbaf01045e3f3
Merge changes I219c2b3a,I7af6fe67
am: 01cc5733ba

Change-Id: Ia8136080aa1caa890c325ed4ed538e3f08456d21