OSDN Git Service

am a8b5f7e7: (-s ours) resolved conflicts for merge of b699685e to mnc-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 11:17:22 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:22 +0000 (11:17 +0000)
commitda8f85a62cb5f341e209cc33ab4f499441963205
treea4db20500e7130fd7856f1fff2d10d10c5234160
parent0ab1c3860ea8150967db205d38f243a871eb8978
parenta8b5f7e73703c3d57086f7aded1749a0801dd997
am a8b5f7e7: (-s ours) resolved conflicts for merge of b699685e to mnc-dev-plus-aosp

* commit 'a8b5f7e73703c3d57086f7aded1749a0801dd997':