am f59c8e4f: am b395a893: (-s ours) am 2067dff2: am 4968dd48: (-s ours) DO NOT MERGE...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:44:12 +0000 (19:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:44:12 +0000 (19:44 +0000)
am: 1ea6f97ed0  -s ours

* commit '1ea6f97ed0f8cc6bbbeea54804903f06f077a786':


Trivial merge