am 9eefd6e7: am 5efd3ca9: (-s ours) am fa285d6b: am 36059e0d: am 7ce9438a: am 0870de9...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:49:38 +0000 (19:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:49:38 +0000 (19:49 +0000)
am: 018322578a  -s ours

* commit '018322578a32071c429fba46db3d16ddf770ba04':


Trivial merge