OSDN Git Service

Resolve merge resolution differences between branches am: 02a29284a2 -s ours
authorScott James Remnant <keybuk@google.com>
Tue, 20 Oct 2015 01:48:43 +0000 (01:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 01:48:43 +0000 (01:48 +0000)
commit91cb0a7288690e2c75da002b2d392c597f135f55
treea28eb32cedd08fb960b63196727a66293d68b973
parent683eeea40e1c4aa32fdf59e26922d8b1bb95de84
parent39db8130c6cc109ada6f10f1f13fc92d419cb3b2
Resolve merge resolution differences between branches am: 02a29284a2  -s ours
am: 39db8130c6

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