resolve merge conflicts of 3ffc2f2 to master
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 19:05:21 +0000 (19:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:05:21 +0000 (19:05 +0000)
commitb43199cd47fe3459571ed315e56c41e1759916d1
treed45289fd9ce56c6b8363d509c9ff36e528a7f5c5
parent81a9b83fb0621c36536decb959078377848d7dbc
parentf2c82779ae945c3e8c16ba24ffe731053a4e81d7
resolve merge conflicts of 3ffc2f2 to master
am: f2c82779ae

Change-Id: If42ab81eae41f7e0c61abb4997df4221361fd0b7