OSDN Git Service

am 7600f85f: am f98e18e6: am d9f98c81: Fix build break due to merge.
authorJeff Brown <jeffbrown@google.com>
Tue, 12 Feb 2013 02:17:16 +0000 (18:17 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Feb 2013 02:17:16 +0000 (18:17 -0800)
commit3529ed562dad473774d8c5b5be3a64cb1d78fdde
tree7d76ee1f89e85f680930abe1685aea90d8f1f630
parentdefa7a4cde401be8c0063bc976599ab661e58f55
parent7600f85f07bc14ded39315bcd958b3fe9388a407
am 7600f85f: am f98e18e6: am d9f98c81: Fix build break due to merge.

# Via Android Git Automerger (2) and Jean-Baptiste Queru (1)
* commit '7600f85f07bc14ded39315bcd958b3fe9388a407':
  Fix build break due to merge.