OSDN Git Service

am 768d1b35: am b1dc3441: (-s ours) am ebbc891a: Merge "Fix build." into mnc-dev
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2015 19:11:47 +0000 (19:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:11:47 +0000 (19:11 +0000)
commit054c1cfcc71903e64f0621d8acff7f3c3bcd2de6
tree0e75e4d3069046fbce1a7cab14d741f321db99d0
parent86caad49c6cae447e7bd1656468f8c37195c427f
parent768d1b356f890bcf3400278ee0089435407609dc
am 768d1b35: am b1dc3441: (-s ours) am ebbc891a: Merge "Fix build." into mnc-dev

* commit '768d1b356f890bcf3400278ee0089435407609dc':