am a7b6dc7a: am 342b03b5: (-s ours) am ca04416b: am 33c9e110: am cee84aa0: am 652dd63...
authorMika Isojärvi <misojarvi@google.com>
Mon, 11 Jan 2016 19:53:20 +0000 (19:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:53:20 +0000 (19:53 +0000)
am: 37d71c3cf2

* commit '37d71c3cf2da32e0952701262408a53e3bd52d59':


Trivial merge