Merge changes Icb29d2da,Ida906e21
authorPyry Haulos <phaulos@google.com>
Fri, 17 Feb 2017 20:26:29 +0000 (20:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Feb 2017 20:26:29 +0000 (20:26 +0000)
commit1cf9161f6f2057d5a79510665c288b9d2ba684f2
tree8a68f325fc87381726442c51bd2e3d6e5230dd3d
parentf6cf6363b26ebf2222b843ec9ae045777e63e091
parentfc868645e28ce37954bd5d5baeb8b0da80248d5e
Merge changes Icb29d2da,Ida906e21
am: fc868645e2

Change-Id: I38ff3fe87631327ac251819797d965d81f064151