OSDN Git Service

Resolve merge resolution differences between branches am: 02a29284a2 -s ours
authorScott James Remnant <keybuk@google.com>
Tue, 20 Oct 2015 20:23:35 +0000 (20:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 20:23:35 +0000 (20:23 +0000)
commita356797a1fd007ac55912a3e04fda520b7701851
tree2dedf0ed6acb03ff309eadca1a670c01f26ce338
parent96a7a421a980fcbf18f7677193883eadb90ab6cb
parent39db8130c6cc109ada6f10f1f13fc92d419cb3b2
Resolve merge resolution differences between branches am: 02a29284a2  -s ours
am: 39db8130c6

* commit '39db8130c6cc109ada6f10f1f13fc92d419cb3b2':
  Resolve merge resolution differences between branches