OSDN Git Service

am c88da7cc: resolved conflicts for merge of 928e05b1 to master
authorSreeram Ramachandran <sreeram@google.com>
Mon, 14 Jul 2014 19:10:43 +0000 (19:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Jul 2014 19:10:43 +0000 (19:10 +0000)
commit5b717fc3ef65472e0fef3305790cfa154780db70
treed3f8a358fd411edbd156cffb0c689e832a73e995
parentaa862d064381e99cac380a87f88c2f69532edc90
parentc88da7cc21c61b9ac8fcac11aa812f647ffb181c
am c88da7cc: resolved conflicts for merge of 928e05b1 to master

* commit 'c88da7cc21c61b9ac8fcac11aa812f647ffb181c':