Merge changes I219c2b3a,I7af6fe67 am: 01cc5733ba
authorPyry Haulos <phaulos@google.com>
Mon, 25 Jul 2016 20:48:34 +0000 (20:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:48:34 +0000 (20:48 +0000)
commit822f089731443f9f1aa961a919a0ace61f7892d2
treead3393a12396569626a6254d6d340b04f2401e27
parentfc25428102ad916af47d9ffae4e8d1b03796ee1f
parent7d8ddf4d02343d83548ffbd0341f6a2a78d55e81
Merge changes I219c2b3a,I7af6fe67 am: 01cc5733ba
am: 7d8ddf4d02

Change-Id: I4a2e8bb5d0a016f094aa5c40b6717a14c4c6166f