am 065747c4: (-s ours) am 6a9b20d7: (-s ours) am d64e6d7e: Merge "DO NOT MERGE: Fix...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:46:37 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:37 +0000 (14:46 +0000)
* commit '065747c44e670404b286974a14f5dcb9905aa68d':


Trivial merge