OSDN Git Service

am f8a30598: resolved conflict in mergre to goog/master
authorEd Heyl <ed@google.com>
Thu, 26 Jul 2012 15:04:38 +0000 (08:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Jul 2012 15:04:38 +0000 (08:04 -0700)
commit233a97a88283ae95a60fde4965a0fb8dccd9af26
tree8afb28a8adc13793dd621ab5e9a3a2644c3f9e6f
parent6bfa73ea3b0371eef1ead14c339aa8aee30cf63f
parentf8a30598925855cb387511d32a5b3388ebc908c8
am f8a30598: resolved conflict in mergre to goog/master

* commit 'f8a30598925855cb387511d32a5b3388ebc908c8':