OSDN Git Service

am a78b25f8: (-s ours) DO NOT MERGE
authorWinson Chung <winsonc@google.com>
Tue, 22 Oct 2013 09:47:40 +0000 (02:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Oct 2013 09:47:40 +0000 (02:47 -0700)
commit9ba343d7348301fc02c2eb2cd0f7d16081e417e2
tree23c9090477bad8f58733a9434d799c8f8cf28ad9
parent313bbd2f3bb66597e14913696eaebd1b596ebba7
parenta78b25f89de49b68a6dd7ddef5aaefe7919f3698
am a78b25f8: (-s ours) DO NOT MERGE

* commit 'a78b25f89de49b68a6dd7ddef5aaefe7919f3698':
  DO NOT MERGE