OSDN Git Service

am ad06e79d: (-s ours) resolved conflicts for merge of 743e4b08 to mnc-dev-plus-aosp
authorSimon Wilson <simonwilson@google.com>
Thu, 27 Aug 2015 11:17:14 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:14 +0000 (11:17 +0000)
commit6fe1cd011a3e438ff4cb0b6d356e8e1643c801ec
treea4db20500e7130fd7856f1fff2d10d10c5234160
parent5f186eda713c7b6a4cae7f1e4f4ff2fce251b6fe
parentad06e79de060959cf5bea8a3d09e86cb097f67ed
am ad06e79d: (-s ours) resolved conflicts for merge of 743e4b08 to mnc-dev-plus-aosp

* commit 'ad06e79de060959cf5bea8a3d09e86cb097f67ed':