OSDN Git Service

am 5eedef96: am fcda22b1: Merge "am b6d14a00: resolved conflicts for merge of c29791d...
authorAndreas Gampe <agampe@google.com>
Thu, 30 Apr 2015 18:29:35 +0000 (18:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Apr 2015 18:29:35 +0000 (18:29 +0000)
commitd3e8ddfe0145939078532db055c5f866d40aaa71
treefec7cbd7cdab17f4cb203f419764094b50ef7be5
parent521fea49c3bbd0999b1327dea9e874e2e30c18c9
parent5eedef96d9408cdb78b5a28878bf1013cc11f8d3
am 5eedef96: am fcda22b1: Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev

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