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:42:01 +0000 (19:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:42:01 +0000 (19:42 +0000)
am: 020a94a8a3  -s ours

* commit '020a94a8a3489b1d67c63759cec55dd7fa837dae':


Trivial merge