resolve merge conflicts of e5f7483 to master am: c4598ea31b am: 8e2e181bd6
authorPyry Haulos <phaulos@google.com>
Wed, 19 Oct 2016 19:31:37 +0000 (19:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Oct 2016 19:31:37 +0000 (19:31 +0000)
commite713959f89ea347a54f0a7a24bac141d54a3fc0e
tree62d9dec60de914ec79def9edacb60d63441fd326
parent533566c56960205a5d62b7cac444b7e0ab2a6b17
parentcd63b8bc8580ff9328806540cec3a2c1a24f15fd
resolve merge conflicts of e5f7483 to master am: c4598ea31b am: 8e2e181bd6
am: cd63b8bc85

Change-Id: I5b706fe9687c1c849152e5f094bb2d76611e8506