OSDN Git Service

am d3e8ddfe: am 5eedef96: am fcda22b1: Merge "am b6d14a00: resolved conflicts for...
authorAndreas Gampe <agampe@google.com>
Thu, 30 Apr 2015 18:39:25 +0000 (18:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Apr 2015 18:39:25 +0000 (18:39 +0000)
commit6bc6b52c9a050ce8685aefca0eeb8688ad1b5803
tree6927148418b461a4ecedbe98c3373a4b8ae598c4
parent25e68f24fbd96096eadadae29381c984b5e310b3
parentd3e8ddfe0145939078532db055c5f866d40aaa71
am d3e8ddfe: am 5eedef96: am fcda22b1: Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev

* commit 'd3e8ddfe0145939078532db055c5f866d40aaa71':
  am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp