resolve merge conflicts of e5f7483 to master am: c4598ea31b
authorPyry Haulos <phaulos@google.com>
Wed, 19 Oct 2016 19:23:31 +0000 (19:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Oct 2016 19:23:31 +0000 (19:23 +0000)
commitcd63b8bc8580ff9328806540cec3a2c1a24f15fd
tree3c141a788cb6f3ff8bf1f81482609b5bc9a36739
parent73985744478ff10ad81751a626e6a5326264a36f
parent8e2e181bd661d7f8b879898c2bf2965b0a515819
resolve merge conflicts of e5f7483 to master am: c4598ea31b
am: 8e2e181bd6

Change-Id: I5007494e2a76aaa637f7f009e1a873ba0eec4e2f