OSDN Git Service

am e07a0602: (-s ours) am 692a244b: Fix build.
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2015 09:43:24 +0000 (09:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:43:24 +0000 (09:43 +0000)
commit0c5c96cb91d3ee76d38c775ec49b1abc43c23d97
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent58e1dd11f422e8be0acd71c4d0beedebb9eb2464
parente07a060298c96d949de7bf61d20e091bc974a081
am e07a0602: (-s ours) am 692a244b: Fix build.

* commit 'e07a060298c96d949de7bf61d20e091bc974a081':