OSDN Git Service

am 56ef86df: resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp
authorBrian Carlstrom <bdc@google.com>
Thu, 7 Aug 2014 05:37:58 +0000 (05:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Aug 2014 05:37:58 +0000 (05:37 +0000)
commitd2628cb5956d699581eacbfa03577abfd2661789
treef5a1f1e570ca90d7b2c767355da8785145e81881
parent9170a80c5b51db9423f56f18729df4d01eff064a
parent56ef86df84ba7d8b26b663f49ae40f8c86b4b95b
am 56ef86df: resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp

* commit '56ef86df84ba7d8b26b663f49ae40f8c86b4b95b':
  resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp