OSDN Git Service

am 8d0c89ad: Merge "resolved conflicts for merge of 4f342e87 to master"
authorJeff Tinker <jtinker@google.com>
Fri, 4 Apr 2014 01:55:50 +0000 (01:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Apr 2014 01:55:50 +0000 (01:55 +0000)
commitc22e5339b666ccdfdd8cbd7a2e42a0ec6dbfd695
tree6c443618e0e10e11dcb800ff8d99ca0b2fbf4478
parent2d79bb230017360688a3048cf77b2d4fea8ed50d
parent8d0c89ad16193e98c7a96f13d8f03a05e75a0f4a
am 8d0c89ad: Merge "resolved conflicts for merge of 4f342e87 to master"

* commit '8d0c89ad16193e98c7a96f13d8f03a05e75a0f4a':
  resolved conflicts for merge of 4f342e87 to master