resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae am: b43199cd47
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 19:15:46 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:15:46 +0000 (19:15 +0000)
commit1f61a3ca8e088c81250c0f8cbe6528bc11a83a1f
tree31695586bf4208aa8c39b4f932b0821f291ff26f
parenta3e36cb1f19c2721a905a4e8dd10e2dfc8942322
parent93119248d0b5865bfa97a96d43814e18a6a05e9c
resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae am: b43199cd47
am: 93119248d0

Change-Id: I79d317d122e5b9f7d1dea940ae7db4f940018d1d