resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 19:10:00 +0000 (19:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:10:00 +0000 (19:10 +0000)
commit93119248d0b5865bfa97a96d43814e18a6a05e9c
treed45289fd9ce56c6b8363d509c9ff36e528a7f5c5
parent86cd16b15554eaf9ab1b38e5b406804ca52bb36e
parentb43199cd47fe3459571ed315e56c41e1759916d1
resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae
am: b43199cd47

Change-Id: I5524fb9992aacac7b2bb78048f0b1243c5a03bf9