resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae am: b43199cd47 am: 93119248d0
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 20:16:08 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 20:16:08 +0000 (20:16 +0000)
commit9e62d162fc9cb4a23fee568a7f348302dd2040f2
tree31695586bf4208aa8c39b4f932b0821f291ff26f
parente4b580ab8d4c82a79155dd2a833d09042744e920
parent1f61a3ca8e088c81250c0f8cbe6528bc11a83a1f
resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae am: b43199cd47 am: 93119248d0
am: 1f61a3ca8e

Change-Id: I21523670469267f399b8dd564429db738916b322