| commit | fcd08ec1caa500e8b1a85f98322f6af0100cf2f2 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Dec 10 18:43:40 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 18:43:40 2013 +0000 |
| tree | 4b8f2be06a9d6553e380bdad83e21432fa76ae79 | |
| parent | 9de171858c9895c4cf6e65e3fb008ae85b22a0f5 [diff] | |
| parent | 0bd030b5df7381949ff368f15ebca214560fbf22 [diff] |
am 0bd030b5: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev * commit '0bd030b5df7381949ff368f15ebca214560fbf22':