resolve merge conflicts of b172f9e to master am: ed8e08ff82
authorPyry Haulos <phaulos@google.com>
Wed, 14 Sep 2016 20:06:32 +0000 (20:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Sep 2016 20:06:32 +0000 (20:06 +0000)
commit29baf28a2fbcb499854fcc863849637057d4d303
tree0f4089d00ecffb9fc8a583498999741a8a5be26b
parent9c2b1c4012fd73e506bd06c5e1c12f6950e1593e
parent657bfbfb71b75b63d7ab78afa50ec321bd5f0b06
resolve merge conflicts of b172f9e to master am: ed8e08ff82
am: 657bfbfb71

Change-Id: I329c5178d1e1f453313f99ca9019ba9f7ba3fa8c