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:51:42 +0000 (19:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:51:42 +0000 (19:51 +0000)
am: 36d1cf6f72

* commit '36d1cf6f725e51cfac5240b9c70fe037775cca97':


Trivial merge